From 66b91c4093b8177213e4c3951c54f91a1ce90e92 Mon Sep 17 00:00:00 2001 From: Troy Kessler Date: Thu, 18 Apr 2024 09:49:11 +0200 Subject: [PATCH] feat: created github.com/KYVENetwork/cometbft/v034x --- .changelog/epilogue.md | 2 +- .../9936-p2p-fix-envelope-sending.md | 2 +- .../dependencies/9787-btcec-dep-update.md | 2 +- .../features/9759-kvindexer-match-event.md | 2 +- .../56-rpc-cache-rpc-responses.md | 2 +- .../improvements/9733-consensus-metrics.md | 2 +- .../9759-kvindexer-match-event.md | 2 +- .../improvements/9764-p2p-fix-logspam.md | 2 +- .../9776-consensus-vote-bandwidth.md | 2 +- .golangci.yml | 4 +- CHANGELOG.md | 20 +- Makefile | 2 +- UPGRADING.md | 6 +- abci/client/client.go | 8 +- abci/client/grpc_client.go | 8 +- abci/client/local_client.go | 6 +- abci/client/mocks/client.go | 6 +- abci/client/socket_client.go | 10 +- abci/client/socket_client_test.go | 10 +- abci/cmd/abci-cli/abci-cli.go | 24 +- abci/example/counter/counter.go | 4 +- abci/example/example_test.go | 16 +- abci/example/kvstore/helpers.go | 4 +- abci/example/kvstore/kvstore.go | 6 +- abci/example/kvstore/kvstore_test.go | 16 +- abci/example/kvstore/persistent_kvstore.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/tests/test_app/app.go | 6 +- abci/tests/test_app/main.go | 4 +- abci/tests/test_app/test.sh | 2 +- abci/types/messages_test.go | 2 +- abci/types/pubkey.go | 6 +- abci/types/types.pb.go | 634 +++++++++--------- abci/version/version.go | 2 +- behaviour/peer_behaviour.go | 2 +- behaviour/reporter.go | 4 +- behaviour/reporter_test.go | 4 +- blockchain/msgs.go | 6 +- blockchain/msgs_test.go | 4 +- blockchain/v0/pool.go | 12 +- blockchain/v0/pool_test.go | 10 +- blockchain/v0/reactor.go | 14 +- blockchain/v0/reactor_test.go | 22 +- blockchain/v1/peer.go | 8 +- blockchain/v1/peer_test.go | 8 +- blockchain/v1/pool.go | 6 +- blockchain/v1/pool_test.go | 6 +- blockchain/v1/reactor.go | 16 +- blockchain/v1/reactor_fsm.go | 6 +- blockchain/v1/reactor_fsm_test.go | 10 +- blockchain/v1/reactor_test.go | 24 +- blockchain/v2/io.go | 8 +- blockchain/v2/processor.go | 6 +- blockchain/v2/processor_context.go | 4 +- blockchain/v2/processor_test.go | 6 +- blockchain/v2/reactor.go | 16 +- blockchain/v2/reactor_test.go | 30 +- blockchain/v2/routine.go | 2 +- blockchain/v2/scheduler.go | 4 +- blockchain/v2/scheduler_test.go | 6 +- 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/light.go | 18 +- cmd/cometbft/commands/probe_upnp.go | 4 +- cmd/cometbft/commands/reindex_event.go | 24 +- 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 | 8 +- 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 +- config/config.go | 4 +- config/toml.go | 12 +- consensus/byzantine_test.go | 34 +- consensus/common_test.go | 42 +- consensus/invalid_test.go | 14 +- consensus/mempool_test.go | 10 +- consensus/metrics.go | 2 +- 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 | 12 +- consensus/replay_test.go | 28 +- consensus/state.go | 40 +- consensus/state_test.go | 18 +- consensus/ticker.go | 4 +- consensus/types/height_vote_set.go | 10 +- consensus/types/height_vote_set_test.go | 12 +- consensus/types/peer_round_state.go | 4 +- consensus/types/round_state.go | 4 +- consensus/wal.go | 20 +- consensus/wal_generator.go | 18 +- consensus/wal_test.go | 12 +- crypto/README.md | 12 +- crypto/crypto.go | 4 +- crypto/ed25519/bench_test.go | 4 +- crypto/ed25519/ed25519.go | 10 +- crypto/ed25519/ed25519_test.go | 6 +- crypto/encoding/codec.go | 16 +- 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/bench_test.go | 4 +- crypto/sr25519/encoding.go | 8 +- crypto/sr25519/privkey.go | 2 +- crypto/sr25519/pubkey.go | 4 +- crypto/sr25519/sr25519_test.go | 6 +- crypto/tmhash/hash_test.go | 2 +- crypto/xsalsa20symmetric/symmetric.go | 2 +- crypto/xsalsa20symmetric/symmetric_test.go | 2 +- docs/app-dev/getting-started.md | 2 +- docs/core/configuration.md | 4 +- docs/core/fast-sync.md | 6 +- docs/core/running-in-production.md | 2 +- docs/core/subscription.md | 14 +- docs/core/using-cometbft.md | 16 +- docs/guides/go-built-in.md | 4 +- docs/guides/upgrading-from-tm.md | 4 +- docs/qa/CometBFT-QA-34.md | 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 | 22 +- go.mod | 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 | 2 +- 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/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/os/os_test.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/empty_test.go | 2 +- libs/pubsub/query/fuzz_test/main.go | 2 +- libs/pubsub/query/parser_test.go | 2 +- libs/pubsub/query/query_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 | 12 +- light/detector.go | 4 +- light/detector_test.go | 12 +- 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/cache.go | 4 +- mempool/ids_test.go | 2 +- mempool/mempool.go | 4 +- mempool/mock/mempool.go | 8 +- mempool/tx.go | 2 +- mempool/v0/bench_test.go | 6 +- mempool/v0/cache_test.go | 10 +- mempool/v0/clist_mempool.go | 22 +- mempool/v0/clist_mempool_test.go | 26 +- mempool/v0/reactor.go | 18 +- mempool/v0/reactor_test.go | 26 +- mempool/v1/mempool.go | 14 +- mempool/v1/mempool_bench_test.go | 2 +- mempool/v1/mempool_test.go | 16 +- mempool/v1/reactor.go | 18 +- mempool/v1/reactor_test.go | 18 +- mempool/v1/tx.go | 2 +- node/id.go | 2 +- node/node.go | 84 +-- node/node_test.go | 36 +- p2p/base_reactor.go | 4 +- p2p/conn/conn_go110.go | 2 +- p2p/conn/conn_notgo110.go | 4 +- p2p/conn/connection.go | 18 +- p2p/conn/connection_test.go | 10 +- p2p/conn/evil_secret_connection_test.go | 10 +- p2p/conn/secret_connection.go | 20 +- 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/mocks/peer_envelope_sender.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/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 | 12 +- p2p/switch.go | 12 +- p2p/switch_test.go | 12 +- p2p/test_util.go | 16 +- p2p/transport.go | 10 +- p2p/transport_test.go | 8 +- p2p/trust/metric.go | 4 +- p2p/trust/store.go | 4 +- p2p/trust/store_test.go | 2 +- p2p/types.go | 4 +- p2p/upnp/probe.go | 2 +- 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 | 6 +- privval/socket_listeners_test.go | 2 +- privval/utils.go | 6 +- proto/buf.yaml | 2 +- .../v034x}/abci/types.proto | 26 +- .../v034x}/blockchain/message.go | 2 +- .../v034x}/blockchain/types.pb.go | 91 +-- .../v034x}/blockchain/types.proto | 8 +- .../v034x}/consensus/message.go | 2 +- .../v034x}/consensus/types.pb.go | 175 ++--- .../v034x}/consensus/types.proto | 32 +- .../v034x}/consensus/wal.pb.go | 107 +-- .../v034x}/consensus/wal.proto | 10 +- .../v034x}/crypto/keys.pb.go | 45 +- .../v034x}/crypto/keys.proto | 4 +- .../v034x}/crypto/proof.pb.go | 74 +- .../v034x}/crypto/proof.proto | 4 +- .../v034x}/libs/bits/types.pb.go | 37 +- proto/cometbft/v034x/libs/bits/types.proto | 9 + .../v034x}/mempool/message.go | 2 +- .../v034x}/mempool/types.pb.go | 47 +- proto/cometbft/v034x/mempool/types.proto | 14 + .../v034x}/p2p/conn.pb.go | 87 +-- .../v034x}/p2p/conn.proto | 8 +- .../{tendermint => cometbft/v034x}/p2p/pex.go | 0 .../v034x}/p2p/pex.pb.go | 61 +- .../v034x}/p2p/pex.proto | 6 +- .../v034x}/p2p/types.pb.go | 85 +-- .../v034x}/p2p/types.proto | 4 +- .../v034x}/privval/types.pb.go | 160 ++--- .../v034x}/privval/types.proto | 18 +- .../v034x}/rpc/grpc/types.pb.go | 87 +-- .../v034x}/rpc/grpc/types.proto | 10 +- .../v034x}/state/types.pb.go | 147 ++-- .../v034x}/state/types.proto | 36 +- .../v034x}/statesync/message.go | 2 +- .../v034x}/statesync/types.pb.go | 87 +-- .../v034x}/statesync/types.proto | 4 +- .../v034x}/store/types.pb.go | 35 +- proto/cometbft/v034x/store/types.proto | 9 + .../v034x}/types/block.pb.go | 47 +- proto/cometbft/v034x/types/block.proto | 15 + .../v034x}/types/canonical.pb.go | 93 +-- .../v034x}/types/canonical.proto | 6 +- .../v034x}/types/events.pb.go | 37 +- proto/cometbft/v034x/types/events.proto | 10 + .../v034x}/types/evidence.pb.go | 95 +-- .../v034x}/types/evidence.proto | 16 +- .../v034x}/types/params.pb.go | 107 +-- .../v034x}/types/params.proto | 4 +- .../v034x}/types/types.pb.go | 251 +++---- .../v034x}/types/types.proto | 18 +- .../v034x}/types/validator.pb.go | 78 ++- .../v034x}/types/validator.proto | 10 +- .../v034x}/version/types.pb.go | 47 +- .../v034x}/version/types.proto | 4 +- proto/tendermint/libs/bits/types.proto | 9 - proto/tendermint/mempool/types.proto | 14 - proto/tendermint/store/types.proto | 9 - proto/tendermint/types/block.proto | 15 - proto/tendermint/types/events.proto | 10 - proxy/app_conn.go | 4 +- proxy/app_conn_test.go | 12 +- proxy/client.go | 12 +- proxy/mocks/app_conn_consensus.go | 4 +- 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 | 20 +- 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/abci.go | 12 +- rpc/client/mock/abci_test.go | 14 +- 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 | 12 +- rpc/core/blocks_test.go | 12 +- rpc/core/consensus.go | 10 +- rpc/core/dev.go | 4 +- rpc/core/env.go | 24 +- 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 | 2 +- rpc/grpc/grpc_test.go | 6 +- rpc/grpc/types.pb.go | 26 +- 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 | 12 +- rpc/jsonrpc/client/ws_client_test.go | 6 +- rpc/jsonrpc/jsonrpc_test.go | 12 +- rpc/jsonrpc/server/http_json_handler.go | 6 +- rpc/jsonrpc/server/http_json_handler_test.go | 6 +- 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 | 8 +- 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 | 24 +- scripts/json2wal/main.go | 6 +- scripts/mockery_generate.sh | 2 +- scripts/wal2json/main.go | 4 +- spec/abci/apps.md | 2 +- spec/consensus/evidence.md | 2 +- spec/consensus/proposer-selection.md | 2 +- spec/consensus/signing.md | 2 +- spec/core/encoding.md | 4 +- spec/ivy-proofs/docker-compose.yml | 4 +- spec/light-client/detection/discussions.md | 10 +- .../detection/req-ibc-detection.md | 48 +- spec/p2p/v0.34/peer_manager.md | 6 +- spec/p2p/v0.34/switch.md | 2 +- spec/p2p/v0.34/transport.md | 4 +- spec/rpc/README.md | 14 +- state/execution.go | 18 +- state/execution_test.go | 30 +- state/export_test.go | 8 +- state/helpers_test.go | 20 +- state/indexer/block.go | 4 +- state/indexer/block/kv/kv.go | 8 +- state/indexer/block/kv/kv_test.go | 8 +- state/indexer/block/kv/util.go | 6 +- state/indexer/block/null/null.go | 6 +- state/indexer/mocks/block_indexer.go | 4 +- state/indexer/query_range.go | 4 +- state/indexer/sink/psql/backport.go | 8 +- state/indexer/sink/psql/backport_test.go | 4 +- state/indexer/sink/psql/psql.go | 6 +- state/indexer/sink/psql/psql_test.go | 6 +- state/mocks/block_store.go | 2 +- state/mocks/evidence_pool.go | 4 +- state/mocks/store.go | 8 +- state/rollback.go | 6 +- state/rollback_test.go | 16 +- state/services.go | 2 +- state/state.go | 12 +- state/state_test.go | 22 +- state/store.go | 16 +- state/store_test.go | 14 +- state/tx_filter.go | 4 +- state/tx_filter_test.go | 6 +- state/txindex/indexer.go | 4 +- state/txindex/indexer_service.go | 6 +- state/txindex/indexer_service_test.go | 12 +- state/txindex/kv/kv.go | 10 +- state/txindex/kv/kv_bench_test.go | 6 +- state/txindex/kv/kv_test.go | 12 +- state/txindex/kv/utils.go | 6 +- state/txindex/mocks/tx_indexer.go | 6 +- state/txindex/null/null.go | 6 +- state/validation.go | 4 +- state/validation_test.go | 20 +- 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 | 10 +- store/store_test.go | 20 +- test/app/grpc_client.go | 4 +- test/e2e/app/app.go | 8 +- test/e2e/app/snapshots.go | 2 +- test/e2e/generator/generate.go | 10 +- test/e2e/generator/main.go | 2 +- test/e2e/node/config.go | 2 +- test/e2e/node/main.go | 40 +- test/e2e/pkg/infra/docker/docker.go | 8 +- test/e2e/pkg/testnet.go | 10 +- test/e2e/runner/benchmark.go | 4 +- test/e2e/runner/cleanup.go | 4 +- test/e2e/runner/load.go | 10 +- test/e2e/runner/main.go | 10 +- test/e2e/runner/perturb.go | 6 +- test/e2e/runner/rpc.go | 8 +- test/e2e/runner/setup.go | 16 +- test/e2e/runner/start.go | 4 +- test/e2e/runner/test.go | 2 +- 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/evidence_test.go | 4 +- test/e2e/tests/net_test.go | 2 +- test/e2e/tests/validator_test.go | 4 +- test/fuzz/mempool/v0/checktx.go | 10 +- test/fuzz/mempool/v0/fuzz_test.go | 2 +- test/fuzz/mempool/v1/checktx.go | 12 +- test/fuzz/mempool/v1/fuzz_test.go | 2 +- test/fuzz/p2p/addrbook/fuzz.go | 4 +- test/fuzz/p2p/addrbook/init-corpus/main.go | 4 +- test/fuzz/p2p/pex/init-corpus/main.go | 6 +- test/fuzz/p2p/pex/reactor_receive.go | 14 +- test/fuzz/p2p/secret_connection/read_write.go | 6 +- test/fuzz/rpc/jsonrpc/server/handler.go | 6 +- 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/maverick/consensus/misbehavior.go | 14 +- test/maverick/consensus/msgs.go | 14 +- test/maverick/consensus/reactor.go | 44 +- test/maverick/consensus/replay.go | 14 +- test/maverick/consensus/replay_file.go | 16 +- test/maverick/consensus/replay_stubs.go | 12 +- test/maverick/consensus/state.go | 40 +- test/maverick/consensus/ticker.go | 4 +- test/maverick/consensus/wal.go | 24 +- test/maverick/consensus/wal_generator.go | 20 +- test/maverick/main.go | 26 +- test/maverick/node/node.go | 82 +-- test/maverick/node/privval.go | 16 +- 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 | 8 +- types/events.go | 28 +- types/evidence.go | 24 +- types/evidence_test.go | 12 +- types/genesis.go | 12 +- types/genesis_test.go | 14 +- types/light.go | 2 +- types/light_test.go | 6 +- types/params.go | 6 +- types/params_test.go | 4 +- 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 | 12 +- 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/time/time.go | 2 +- types/tx.go | 8 +- types/tx_test.go | 6 +- types/validation.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 | 10 +- 594 files changed, 3852 insertions(+), 3800 deletions(-) rename proto/{tendermint => cometbft/v034x}/abci/types.proto (94%) rename proto/{tendermint => cometbft/v034x}/blockchain/message.go (97%) rename proto/{tendermint => cometbft/v034x}/blockchain/types.pb.go (90%) rename proto/{tendermint => cometbft/v034x}/blockchain/types.proto (79%) rename proto/{tendermint => cometbft/v034x}/consensus/message.go (98%) rename proto/{tendermint => cometbft/v034x}/consensus/types.pb.go (91%) rename proto/{tendermint => cometbft/v034x}/consensus/types.proto (68%) rename proto/{tendermint => cometbft/v034x}/consensus/wal.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/consensus/wal.proto (80%) rename proto/{tendermint => cometbft/v034x}/crypto/keys.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/crypto/keys.proto (70%) rename proto/{tendermint => cometbft/v034x}/crypto/proof.pb.go (90%) rename proto/{tendermint => cometbft/v034x}/crypto/proof.proto (86%) rename proto/{tendermint => cometbft/v034x}/libs/bits/types.pb.go (85%) create mode 100644 proto/cometbft/v034x/libs/bits/types.proto rename proto/{tendermint => cometbft/v034x}/mempool/message.go (92%) rename proto/{tendermint => cometbft/v034x}/mempool/types.pb.go (87%) create mode 100644 proto/cometbft/v034x/mempool/types.proto rename proto/{tendermint => cometbft/v034x}/p2p/conn.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/p2p/conn.proto (66%) rename proto/{tendermint => cometbft/v034x}/p2p/pex.go (100%) rename proto/{tendermint => cometbft/v034x}/p2p/pex.pb.go (87%) rename proto/{tendermint => cometbft/v034x}/p2p/pex.proto (63%) rename proto/{tendermint => cometbft/v034x}/p2p/types.pb.go (89%) rename proto/{tendermint => cometbft/v034x}/p2p/types.proto (89%) rename proto/{tendermint => cometbft/v034x}/privval/types.pb.go (90%) rename proto/{tendermint => cometbft/v034x}/privval/types.proto (77%) rename proto/{tendermint => cometbft/v034x}/rpc/grpc/types.pb.go (86%) rename proto/{tendermint => cometbft/v034x}/rpc/grpc/types.proto (64%) rename proto/{tendermint => cometbft/v034x}/state/types.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/state/types.proto (64%) rename proto/{tendermint => cometbft/v034x}/statesync/message.go (96%) rename proto/{tendermint => cometbft/v034x}/statesync/types.pb.go (91%) rename proto/{tendermint => cometbft/v034x}/statesync/types.proto (83%) rename proto/{tendermint => cometbft/v034x}/store/types.pb.go (82%) create mode 100644 proto/cometbft/v034x/store/types.proto rename proto/{tendermint => cometbft/v034x}/types/block.pb.go (83%) create mode 100644 proto/cometbft/v034x/types/block.proto rename proto/{tendermint => cometbft/v034x}/types/canonical.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/types/canonical.proto (90%) rename proto/{tendermint => cometbft/v034x}/types/events.pb.go (83%) create mode 100644 proto/cometbft/v034x/types/events.proto rename proto/{tendermint => cometbft/v034x}/types/evidence.pb.go (88%) rename proto/{tendermint => cometbft/v034x}/types/evidence.proto (70%) rename proto/{tendermint => cometbft/v034x}/types/params.pb.go (89%) rename proto/{tendermint => cometbft/v034x}/types/params.proto (95%) rename proto/{tendermint => cometbft/v034x}/types/types.pb.go (90%) rename proto/{tendermint => cometbft/v034x}/types/types.proto (91%) rename proto/{tendermint => cometbft/v034x}/types/validator.pb.go (87%) rename proto/{tendermint => cometbft/v034x}/types/validator.proto (61%) rename proto/{tendermint => cometbft/v034x}/version/types.pb.go (86%) rename proto/{tendermint => cometbft/v034x}/version/types.proto (82%) delete mode 100644 proto/tendermint/libs/bits/types.proto delete mode 100644 proto/tendermint/mempool/types.proto delete mode 100644 proto/tendermint/store/types.proto delete mode 100644 proto/tendermint/types/block.proto delete mode 100644 proto/tendermint/types/events.proto diff --git a/.changelog/epilogue.md b/.changelog/epilogue.md index 1e68f6b7281..0c92fef51e0 100644 --- a/.changelog/epilogue.md +++ b/.changelog/epilogue.md @@ -11,4 +11,4 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos). For changes released before the creation of CometBFT, please refer to the Tendermint Core -[CHANGELOG.md](https://github.com/tendermint/tendermint/blob/a9feb1c023e172b542c972605311af83b777855b/CHANGELOG.md). +[CHANGELOG.md](https://github.com/KYVENetwork/cometbft/v034x/blob/a9feb1c023e172b542c972605311af83b777855b/CHANGELOG.md). diff --git a/.changelog/v0.34.27/bug-fixes/9936-p2p-fix-envelope-sending.md b/.changelog/v0.34.27/bug-fixes/9936-p2p-fix-envelope-sending.md index fd38b79b9f7..9130e0b1100 100644 --- a/.changelog/v0.34.27/bug-fixes/9936-p2p-fix-envelope-sending.md +++ b/.changelog/v0.34.27/bug-fixes/9936-p2p-fix-envelope-sending.md @@ -2,4 +2,4 @@ send messages, as opposed to the blocking `SendEnvelope` method. It is unclear whether this has a meaningful impact on P2P performance, but this patch does correct the underlying behaviour to what it should be - ([tendermint/tendermint\#9936](https://github.com/tendermint/tendermint/pull/9936)) + ([tendermint/tendermint\#9936](https://github.com/KYVENetwork/cometbft/v034x/pull/9936)) diff --git a/.changelog/v0.34.27/dependencies/9787-btcec-dep-update.md b/.changelog/v0.34.27/dependencies/9787-btcec-dep-update.md index d155748e0cb..609559253a4 100644 --- a/.changelog/v0.34.27/dependencies/9787-btcec-dep-update.md +++ b/.changelog/v0.34.27/dependencies/9787-btcec-dep-update.md @@ -1,3 +1,3 @@ - `[crypto]` Update to use btcec v2 and the latest btcutil - ([tendermint/tendermint\#9787](https://github.com/tendermint/tendermint/pull/9787): + ([tendermint/tendermint\#9787](https://github.com/KYVENetwork/cometbft/v034x/pull/9787): @wcsiu) diff --git a/.changelog/v0.34.27/features/9759-kvindexer-match-event.md b/.changelog/v0.34.27/features/9759-kvindexer-match-event.md index 281f6cd1fb8..ea2da013487 100644 --- a/.changelog/v0.34.27/features/9759-kvindexer-match-event.md +++ b/.changelog/v0.34.27/features/9759-kvindexer-match-event.md @@ -1,3 +1,3 @@ - `[rpc]` Add `match_event` query parameter to indicate to the RPC that it should match events _within_ attributes, not only within a height - ([tendermint/tendermint\#9759](https://github.com/tendermint/tendermint/pull/9759)) + ([tendermint/tendermint\#9759](https://github.com/KYVENetwork/cometbft/v034x/pull/9759)) diff --git a/.changelog/v0.34.27/improvements/56-rpc-cache-rpc-responses.md b/.changelog/v0.34.27/improvements/56-rpc-cache-rpc-responses.md index 344b3df93b9..79387308a80 100644 --- a/.changelog/v0.34.27/improvements/56-rpc-cache-rpc-responses.md +++ b/.changelog/v0.34.27/improvements/56-rpc-cache-rpc-responses.md @@ -1,2 +1,2 @@ - `[e2e]` Add functionality for uncoordinated (minor) upgrades - ([\#56](https://github.com/tendermint/tendermint/pull/56)) \ No newline at end of file + ([\#56](https://github.com/KYVENetwork/cometbft/v034x/pull/56)) diff --git a/.changelog/v0.34.27/improvements/9733-consensus-metrics.md b/.changelog/v0.34.27/improvements/9733-consensus-metrics.md index 77d8c743ec7..41664e12fbb 100644 --- a/.changelog/v0.34.27/improvements/9733-consensus-metrics.md +++ b/.changelog/v0.34.27/improvements/9733-consensus-metrics.md @@ -1,4 +1,4 @@ - `[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 - ([tendermint/tendermint\#9733](https://github.com/tendermint/tendermint/pull/9733)) + ([tendermint/tendermint\#9733](https://github.com/KYVENetwork/cometbft/v034x/pull/9733)) diff --git a/.changelog/v0.34.27/improvements/9759-kvindexer-match-event.md b/.changelog/v0.34.27/improvements/9759-kvindexer-match-event.md index 8b5757cb8ec..6df0c02beba 100644 --- a/.changelog/v0.34.27/improvements/9759-kvindexer-match-event.md +++ b/.changelog/v0.34.27/improvements/9759-kvindexer-match-event.md @@ -1,3 +1,3 @@ - `[state/kvindexer]` Add `match.event` keyword to support condition evaluation based on the event the attributes belong to - ([tendermint/tendermint\#9759](https://github.com/tendermint/tendermint/pull/9759)) + ([tendermint/tendermint\#9759](https://github.com/KYVENetwork/cometbft/v034x/pull/9759)) diff --git a/.changelog/v0.34.27/improvements/9764-p2p-fix-logspam.md b/.changelog/v0.34.27/improvements/9764-p2p-fix-logspam.md index 78fa6844fee..0f32198bdd8 100644 --- a/.changelog/v0.34.27/improvements/9764-p2p-fix-logspam.md +++ b/.changelog/v0.34.27/improvements/9764-p2p-fix-logspam.md @@ -1,4 +1,4 @@ - `[p2p]` Reduce log spam through reducing log level of "Dialing peer" and "Added peer" messages from info to debug - ([tendermint/tendermint\#9764](https://github.com/tendermint/tendermint/pull/9764): + ([tendermint/tendermint\#9764](https://github.com/KYVENetwork/cometbft/v034x/pull/9764): @faddat) diff --git a/.changelog/v0.34.27/improvements/9776-consensus-vote-bandwidth.md b/.changelog/v0.34.27/improvements/9776-consensus-vote-bandwidth.md index 2bfdd05acf8..daedd1faf2f 100644 --- a/.changelog/v0.34.27/improvements/9776-consensus-vote-bandwidth.md +++ b/.changelog/v0.34.27/improvements/9776-consensus-vote-bandwidth.md @@ -1,3 +1,3 @@ - `[consensus]` Reduce bandwidth consumption of consensus votes by roughly 50% through fixing a small logic bug - ([tendermint/tendermint\#9776](https://github.com/tendermint/tendermint/pull/9776)) + ([tendermint/tendermint\#9776](https://github.com/KYVENetwork/cometbft/v034x/pull/9776)) diff --git a/.golangci.yml b/.golangci.yml index 278a50ff79e..8e5976a444c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -61,7 +61,7 @@ linters-settings: - "!$test" allow: - $gostd - - github.com/tendermint + - github.com/cometbft - github.com/cometbft - github.com/cosmos - github.com/gogo @@ -97,7 +97,7 @@ linters-settings: allow: - $gostd - github.com/cosmos - - github.com/tendermint + - github.com/cometbft - github.com/cometbft - github.com/gogo - github.com/Workiva/go-datastructures diff --git a/CHANGELOG.md b/CHANGELOG.md index f2baee968a7..f4fe6c4e73b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,7 +61,7 @@ gossip. ([\#1584](https://github.com/cometbft/cometbft/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. + which the node gossip transactions. ([\#1558](https://github.com/cometbft/cometbft/pull/1558)) ([\#1584](https://github.com/cometbft/cometbft/pull/1584)) @@ -183,7 +183,7 @@ to this release! send messages, as opposed to the blocking `SendEnvelope` method. It is unclear whether this has a meaningful impact on P2P performance, but this patch does correct the underlying behaviour to what it should be - ([tendermint/tendermint\#9936](https://github.com/tendermint/tendermint/pull/9936)) + ([tendermint/tendermint\#9936](https://github.com/KYVENetwork/cometbft/v034x/pull/9936)) ### DEPENDENCIES @@ -193,19 +193,19 @@ to this release! - Bump tm-load-test to v1.3.0 to remove implicit dependency on Tendermint Core ([\#165](https://github.com/cometbft/cometbft/pull/165)) - `[crypto]` Update to use btcec v2 and the latest btcutil - ([tendermint/tendermint\#9787](https://github.com/tendermint/tendermint/pull/9787): + ([tendermint/tendermint\#9787](https://github.com/KYVENetwork/cometbft/v034x/pull/9787): @wcsiu) ### FEATURES - `[rpc]` Add `match_event` query parameter to indicate to the RPC that it should match events _within_ attributes, not only within a height - ([tendermint/tendermint\#9759](https://github.com/tendermint/tendermint/pull/9759)) + ([tendermint/tendermint\#9759](https://github.com/KYVENetwork/cometbft/v034x/pull/9759)) ### IMPROVEMENTS - `[e2e]` Add functionality for uncoordinated (minor) upgrades - ([\#56](https://github.com/tendermint/tendermint/pull/56)) + ([\#56](https://github.com/KYVENetwork/cometbft/v034x/pull/56)) - `[tools/tm-signer-harness]` Remove the folder as it is unused ([\#136](https://github.com/cometbft/cometbft/issues/136)) - Append the commit hash to the version of CometBFT being built @@ -216,17 +216,17 @@ to this release! - `[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 - ([tendermint/tendermint\#9733](https://github.com/tendermint/tendermint/pull/9733)) + ([tendermint/tendermint\#9733](https://github.com/KYVENetwork/cometbft/v034x/pull/9733)) - `[state/kvindexer]` Add `match.event` keyword to support condition evaluation based on the event the attributes belong to - ([tendermint/tendermint\#9759](https://github.com/tendermint/tendermint/pull/9759)) + ([tendermint/tendermint\#9759](https://github.com/KYVENetwork/cometbft/v034x/pull/9759)) - `[p2p]` Reduce log spam through reducing log level of "Dialing peer" and "Added peer" messages from info to debug - ([tendermint/tendermint\#9764](https://github.com/tendermint/tendermint/pull/9764): + ([tendermint/tendermint\#9764](https://github.com/KYVENetwork/cometbft/v034x/pull/9764): @faddat) - `[consensus]` Reduce bandwidth consumption of consensus votes by roughly 50% through fixing a small logic bug - ([tendermint/tendermint\#9776](https://github.com/tendermint/tendermint/pull/9776)) + ([tendermint/tendermint\#9776](https://github.com/KYVENetwork/cometbft/v034x/pull/9776)) --- @@ -241,5 +241,5 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos). For changes released before the creation of CometBFT, please refer to the Tendermint Core -[CHANGELOG.md](https://github.com/tendermint/tendermint/blob/a9feb1c023e172b542c972605311af83b777855b/CHANGELOG.md). +[CHANGELOG.md](https://github.com/KYVENetwork/cometbft/v034x/blob/a9feb1c023e172b542c972605311af83b777855b/CHANGELOG.md). diff --git a/Makefile b/Makefile index c28d6da752b..821e97d0912 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ 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/ + @mv ./proto/cometbft/v034x/abci/types.pb.go ./abci/types/ .PHONY: proto-gen # These targets are provided for convenience and are intended for local diff --git a/UPGRADING.md b/UPGRADING.md index f2cae6eadad..3e18614d32b 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -33,7 +33,7 @@ v0.34.24, or Informal Systems' public fork), you can upgrade to CometBFT v0.34.27 by replacing your dependency in your `go.mod` file: ```bash -go mod edit -replace github.com/tendermint/tendermint=github.com/cometbft/cometbft@v0.34.27 +go mod edit -replace github.com/cometbft/cometbft=github.com/cometbft/cometbft@v0.34.27 ``` We make use of the original module URL in order to minimize the impact of @@ -70,9 +70,9 @@ If you run into any trouble with this upgrade, please [contact us][discussions]. For historical upgrading instructions for Tendermint Core v0.34.24 and earlier, please see the [Tendermint Core upgrading instructions][tmupgrade]. -[v03424]: https://github.com/tendermint/tendermint/releases/tag/v0.34.24 +[v03424]: https://github.com/KYVENetwork/cometbft/v034x/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 -[tmupgrade]: https://github.com/tendermint/tendermint/blob/35581cf54ec436b8c37fabb43fdaa3f48339a170/UPGRADING.md +[tmupgrade]: https://github.com/KYVENetwork/cometbft/v034x/blob/35581cf54ec436b8c37fabb43fdaa3f48339a170/UPGRADING.md [go120]: https://go.dev/blog/go1.20 diff --git a/abci/client/client.go b/abci/client/client.go index ff1f143cd86..dbe645c2143 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) const ( @@ -136,7 +136,7 @@ func (r *ReqRes) InvokeCallback() { // marked done and SetCallback is called before calling GetCallback as that // will invoke the callback twice and create a potential race condition. // -// ref: https://github.com/tendermint/tendermint/issues/5439 +// ref: https://github.com/KYVENetwork/cometbft/v034x/issues/5439 func (r *ReqRes) GetCallback() func(*types.Response) { r.mtx.Lock() defer r.mtx.Unlock() diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 31a6a7f6a13..fca31133011 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -9,10 +9,10 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - "github.com/tendermint/tendermint/abci/types" - cmtnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) var _ Client = (*grpcClient)(nil) diff --git a/abci/client/local_client.go b/abci/client/local_client.go index b874e1b62f7..fa478e83b79 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -1,9 +1,9 @@ package abcicli import ( - types "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + types "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) var _ Client = (*localClient)(nil) diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 6d7f99b0f52..ac47ed861f7 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -3,12 +3,12 @@ package mocks import ( - abcicli "github.com/tendermint/tendermint/abci/client" - log "github.com/tendermint/tendermint/libs/log" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + log "github.com/KYVENetwork/cometbft/v034x/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 6cd6f573244..ef9d3e1fac8 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -10,11 +10,11 @@ import ( "reflect" "time" - "github.com/tendermint/tendermint/abci/types" - cmtnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/libs/timer" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/timer" ) const ( diff --git a/abci/client/socket_client_test.go b/abci/client/socket_client_test.go index e20fd1bb1c4..787470a3436 100644 --- a/abci/client/socket_client_test.go +++ b/abci/client/socket_client_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/abci/types" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/server" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) func TestProperSyncCalls(t *testing.T) { diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index 4a0baf868af..91209ee2bc7 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -11,18 +11,18 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/example/counter" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/abci/server" - servertest "github.com/tendermint/tendermint/abci/tests/server" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/abci/version" - "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/example/counter" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/abci/server" + servertest "github.com/KYVENetwork/cometbft/v034x/abci/tests/server" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/abci/version" + "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) // client is a global variable so it can be reused by the console diff --git a/abci/example/counter/counter.go b/abci/example/counter/counter.go index 58f8aabb91e..2b9ed582111 100644 --- a/abci/example/counter/counter.go +++ b/abci/example/counter/counter.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/types" ) type Application struct { diff --git a/abci/example/example_test.go b/abci/example/example_test.go index 0bd172eb25f..9d1a671e75f 100644 --- a/abci/example/example_test.go +++ b/abci/example/example_test.go @@ -15,14 +15,14 @@ import ( "golang.org/x/net/context" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/example/kvstore" - abciserver "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abciserver "github.com/KYVENetwork/cometbft/v034x/abci/server" + "github.com/KYVENetwork/cometbft/v034x/abci/types" ) func init() { diff --git a/abci/example/kvstore/helpers.go b/abci/example/kvstore/helpers.go index 7b450924b07..b94ffd83781 100644 --- a/abci/example/kvstore/helpers.go +++ b/abci/example/kvstore/helpers.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/abci/types" - cmtrand "github.com/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) // RandVal creates one random validator, with a key derived diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index a07f9f6eff4..4d764bbf340 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -8,9 +8,9 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) var ( diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go index fc2b58c8e37..9a2807e40e3 100644 --- a/abci/example/kvstore/kvstore_test.go +++ b/abci/example/kvstore/kvstore_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/code" - abciserver "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/abci/types" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + abciserver "github.com/KYVENetwork/cometbft/v034x/abci/server" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const ( diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index 7e2243358d9..2306c9c3b21 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -9,11 +9,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/types" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/libs/log" - pc "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + pc "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) const ( diff --git a/abci/server/grpc_server.go b/abci/server/grpc_server.go index 913520ab36d..e29525aa994 100644 --- a/abci/server/grpc_server.go +++ b/abci/server/grpc_server.go @@ -5,9 +5,9 @@ import ( "google.golang.org/grpc" - "github.com/tendermint/tendermint/abci/types" - cmtnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) type GRPCServer struct { diff --git a/abci/server/server.go b/abci/server/server.go index 4b70545b21e..1cc9e1062e8 100644 --- a/abci/server/server.go +++ b/abci/server/server.go @@ -10,8 +10,8 @@ package server import ( "fmt" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) func NewServer(protoAddr, transport string, app types.Application) (service.Service, error) { diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index 763402163e3..c3a2636501b 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -8,11 +8,11 @@ import ( "os" "runtime" - "github.com/tendermint/tendermint/abci/types" - cmtlog "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtlog "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) // var maxNumberConnections = 2 diff --git a/abci/tests/benchmarks/parallel/parallel.go b/abci/tests/benchmarks/parallel/parallel.go index 06d3851b280..4102e44901e 100644 --- a/abci/tests/benchmarks/parallel/parallel.go +++ b/abci/tests/benchmarks/parallel/parallel.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/tendermint/tendermint/abci/types" - cmtnet "github.com/tendermint/tendermint/libs/net" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" ) func main() { diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index c7308f590b7..3bf14f6c5a3 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -7,8 +7,8 @@ import ( "log" "reflect" - "github.com/tendermint/tendermint/abci/types" - cmtnet "github.com/tendermint/tendermint/libs/net" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" ) func main() { diff --git a/abci/tests/client_server_test.go b/abci/tests/client_server_test.go index 2ef64e66af0..ffc8be85195 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/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/kvstore" - abciserver "github.com/tendermint/tendermint/abci/server" + abciclient "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abciserver "github.com/KYVENetwork/cometbft/v034x/abci/server" ) func TestClientServerNoAddrPrefix(t *testing.T) { diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go index 877f89cfcde..58afab36823 100644 --- a/abci/tests/server/client.go +++ b/abci/tests/server/client.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/types" - cmtrand "github.com/tendermint/tendermint/libs/rand" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func InitChain(client abcicli.Client) error { diff --git a/abci/tests/test_app/app.go b/abci/tests/test_app/app.go index 9c32fcc7da7..9db73b34ba6 100644 --- a/abci/tests/test_app/app.go +++ b/abci/tests/test_app/app.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func startClient(abciType string) abcicli.Client { diff --git a/abci/tests/test_app/main.go b/abci/tests/test_app/main.go index 1dcab1de180..0b8a279e7f9 100644 --- a/abci/tests/test_app/main.go +++ b/abci/tests/test_app/main.go @@ -7,8 +7,8 @@ import ( "os/exec" "time" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/types" ) var abciType string diff --git a/abci/tests/test_app/test.sh b/abci/tests/test_app/test.sh index 0d83018319e..80ff26e3e97 100755 --- a/abci/tests/test_app/test.sh +++ b/abci/tests/test_app/test.sh @@ -25,4 +25,4 @@ echo "----------------------" # test nodejs counter # TODO: fix node app -#ABCI_APP="node $GOPATH/src/github.com/tendermint/js-abci/example/app.js" go test -test.run TestCounter +#ABCI_APP="node $GOPATH/src/github.com/cometbft/js-abci/example/app.js" go test -test.run TestCounter diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go index 96b7209119e..3c677da45c0 100644 --- a/abci/types/messages_test.go +++ b/abci/types/messages_test.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func TestMarshalJSON(t *testing.T) { diff --git a/abci/types/pubkey.go b/abci/types/pubkey.go index 8530d95383b..37edce9c908 100644 --- a/abci/types/pubkey.go +++ b/abci/types/pubkey.go @@ -3,9 +3,9 @@ package types import ( fmt "fmt" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/secp256k1" ) func Ed25519ValidatorUpdate(pk []byte, power int64) ValidatorUpdate { diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index ed0996b150f..10c8273cd9c 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/abci/types.proto +// source: cometbft/v034x/abci/types.proto package types import ( context "context" fmt "fmt" + crypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + types1 "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - types1 "github.com/tendermint/tendermint/proto/tendermint/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -55,7 +55,7 @@ func (x CheckTxType) String() string { } func (CheckTxType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{0} + return fileDescriptor_fc134a5952b72ac9, []int{0} } type EvidenceType int32 @@ -83,7 +83,7 @@ func (x EvidenceType) String() string { } func (EvidenceType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{1} + return fileDescriptor_fc134a5952b72ac9, []int{1} } type ResponseOfferSnapshot_Result int32 @@ -120,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30, 0} + return fileDescriptor_fc134a5952b72ac9, []int{30, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -157,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32, 0} + return fileDescriptor_fc134a5952b72ac9, []int{32, 0} } type Request struct { @@ -184,7 +184,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_fc134a5952b72ac9, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -422,7 +422,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_fc134a5952b72ac9, []int{1} } func (m *RequestEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -465,7 +465,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_fc134a5952b72ac9, []int{2} } func (m *RequestFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -504,7 +504,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_fc134a5952b72ac9, []int{3} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -564,7 +564,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{4} + return fileDescriptor_fc134a5952b72ac9, []int{4} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -620,7 +620,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{5} + return fileDescriptor_fc134a5952b72ac9, []int{5} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -702,7 +702,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{6} + return fileDescriptor_fc134a5952b72ac9, []int{6} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -770,7 +770,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{7} + return fileDescriptor_fc134a5952b72ac9, []int{7} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -829,14 +829,14 @@ func (m *RequestBeginBlock) GetByzantineValidators() []Evidence { 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.v034x.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{8} + return fileDescriptor_fc134a5952b72ac9, []int{8} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -887,7 +887,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{9} + return fileDescriptor_fc134a5952b72ac9, []int{9} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -931,7 +931,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{10} + return fileDescriptor_fc134a5952b72ac9, []int{10} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -974,7 +974,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{11} + return fileDescriptor_fc134a5952b72ac9, []int{11} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1011,7 +1011,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{12} + return fileDescriptor_fc134a5952b72ac9, []int{12} } func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1050,7 +1050,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{13} + return fileDescriptor_fc134a5952b72ac9, []int{13} } func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1104,7 +1104,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{14} + return fileDescriptor_fc134a5952b72ac9, []int{14} } func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1165,7 +1165,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{15} + return fileDescriptor_fc134a5952b72ac9, []int{15} } func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1241,7 +1241,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{16} + return fileDescriptor_fc134a5952b72ac9, []int{16} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1492,7 +1492,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{17} + return fileDescriptor_fc134a5952b72ac9, []int{17} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1536,7 +1536,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{18} + return fileDescriptor_fc134a5952b72ac9, []int{18} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1579,7 +1579,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{19} + return fileDescriptor_fc134a5952b72ac9, []int{19} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1620,7 +1620,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{20} + return fileDescriptor_fc134a5952b72ac9, []int{20} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1696,7 +1696,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} + return fileDescriptor_fc134a5952b72ac9, []int{21} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1756,7 +1756,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_fc134a5952b72ac9, []int{22} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1823,7 +1823,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_fc134a5952b72ac9, []int{23} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1923,7 +1923,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_252557cfdd89a31a, []int{24} + return fileDescriptor_fc134a5952b72ac9, []int{24} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1979,7 +1979,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{25} + return fileDescriptor_fc134a5952b72ac9, []int{25} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2100,7 +2100,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_fc134a5952b72ac9, []int{26} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2195,7 +2195,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_252557cfdd89a31a, []int{27} + return fileDescriptor_fc134a5952b72ac9, []int{27} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2255,7 +2255,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{28} + return fileDescriptor_fc134a5952b72ac9, []int{28} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2306,7 +2306,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{29} + return fileDescriptor_fc134a5952b72ac9, []int{29} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2343,14 +2343,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.v034x.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{30} + return fileDescriptor_fc134a5952b72ac9, []int{30} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2394,7 +2394,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{31} + return fileDescriptor_fc134a5952b72ac9, []int{31} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2431,7 +2431,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.v034x.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"` } @@ -2440,7 +2440,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{32} + return fileDescriptor_fc134a5952b72ac9, []int{32} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2503,7 +2503,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_252557cfdd89a31a, []int{33} + return fileDescriptor_fc134a5952b72ac9, []int{33} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2572,7 +2572,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_252557cfdd89a31a, []int{34} + return fileDescriptor_fc134a5952b72ac9, []int{34} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2624,7 +2624,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_fc134a5952b72ac9, []int{35} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2679,7 +2679,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{36} + return fileDescriptor_fc134a5952b72ac9, []int{36} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2733,7 +2733,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{37} + return fileDescriptor_fc134a5952b72ac9, []int{37} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2797,7 +2797,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{38} + return fileDescriptor_fc134a5952b72ac9, []int{38} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2865,7 +2865,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{39} + return fileDescriptor_fc134a5952b72ac9, []int{39} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2918,7 +2918,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{40} + return fileDescriptor_fc134a5952b72ac9, []int{40} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2971,7 +2971,7 @@ 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{41} + return fileDescriptor_fc134a5952b72ac9, []int{41} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3015,7 +3015,7 @@ func (m *VoteInfo) GetSignedLastBlock() bool { } type Evidence struct { - Type EvidenceType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.EvidenceType" json:"type,omitempty"` + Type EvidenceType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v034x.abci.EvidenceType" json:"type,omitempty"` // The offending validator Validator Validator `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator"` // The height when the offense occurred @@ -3024,7 +3024,7 @@ type Evidence struct { Time time.Time `protobuf:"bytes,4,opt,name=time,proto3,stdtime" json:"time"` // Total voting power of the validator set in case the ABCI application does // not store historical validators. - // https://github.com/tendermint/tendermint/issues/4581 + // https://github.com/KYVENetwork/cometbft/v034x/issues/4581 TotalVotingPower int64 `protobuf:"varint,5,opt,name=total_voting_power,json=totalVotingPower,proto3" json:"total_voting_power,omitempty"` } @@ -3032,7 +3032,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_252557cfdd89a31a, []int{42} + return fileDescriptor_fc134a5952b72ac9, []int{42} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3108,7 +3108,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{43} + return fileDescriptor_fc134a5952b72ac9, []int{43} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3173,234 +3173,236 @@ func (m *Snapshot) GetMetadata() []byte { } func init() { - proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) - proto.RegisterEnum("tendermint.abci.EvidenceType", EvidenceType_name, EvidenceType_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.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((*RequestSetOption)(nil), "tendermint.abci.RequestSetOption") - proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.RequestInitChain") - proto.RegisterType((*RequestQuery)(nil), "tendermint.abci.RequestQuery") - proto.RegisterType((*RequestBeginBlock)(nil), "tendermint.abci.RequestBeginBlock") - proto.RegisterType((*RequestCheckTx)(nil), "tendermint.abci.RequestCheckTx") - proto.RegisterType((*RequestDeliverTx)(nil), "tendermint.abci.RequestDeliverTx") - proto.RegisterType((*RequestEndBlock)(nil), "tendermint.abci.RequestEndBlock") - 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((*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((*ResponseSetOption)(nil), "tendermint.abci.ResponseSetOption") - proto.RegisterType((*ResponseInitChain)(nil), "tendermint.abci.ResponseInitChain") - proto.RegisterType((*ResponseQuery)(nil), "tendermint.abci.ResponseQuery") - proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.abci.ResponseBeginBlock") - proto.RegisterType((*ResponseCheckTx)(nil), "tendermint.abci.ResponseCheckTx") - proto.RegisterType((*ResponseDeliverTx)(nil), "tendermint.abci.ResponseDeliverTx") - proto.RegisterType((*ResponseEndBlock)(nil), "tendermint.abci.ResponseEndBlock") - 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((*ConsensusParams)(nil), "tendermint.abci.ConsensusParams") - proto.RegisterType((*BlockParams)(nil), "tendermint.abci.BlockParams") - proto.RegisterType((*LastCommitInfo)(nil), "tendermint.abci.LastCommitInfo") - proto.RegisterType((*Event)(nil), "tendermint.abci.Event") - proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") - 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((*Evidence)(nil), "tendermint.abci.Evidence") - proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") -} - -func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } - -var fileDescriptor_252557cfdd89a31a = []byte{ - // 2782 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0xf5, 0xd7, 0x5b, 0xea, 0x2b, 0xeb, 0xe1, 0x1a, 0x33, 0x08, 0x31, 0xd8, 0x43, 0x73, 0xe0, 0x0f, - 0x03, 0xd8, 0x7f, 0xcc, 0x81, 0x40, 0x20, 0x01, 0x4b, 0x68, 0x90, 0xb1, 0xb1, 0x9c, 0xb6, 0x66, - 0xc8, 0x8b, 0x69, 0x5a, 0xea, 0xb2, 0xd4, 0x8c, 0xd4, 0xdd, 0x74, 0x97, 0x8c, 0xc5, 0x32, 0x8f, - 0x0d, 0xd9, 0x90, 0x5d, 0x36, 0x7c, 0x8f, 0xac, 0xb2, 0xc9, 0x86, 0x73, 0xb2, 0x61, 0x99, 0x45, - 0x0e, 0xc9, 0x99, 0x39, 0xd9, 0xe4, 0x0b, 0x64, 0x95, 0x93, 0x9c, 0x7a, 0xf4, 0x4b, 0x52, 0x4b, - 0x32, 0x64, 0x97, 0x5d, 0xd5, 0xed, 0x7b, 0x6f, 0xab, 0xaa, 0xeb, 0xfe, 0xee, 0xef, 0xde, 0x12, - 0x3c, 0x4e, 0xb0, 0xa9, 0x63, 0x67, 0x6c, 0x98, 0x64, 0x4f, 0xeb, 0xf5, 0x8d, 0x3d, 0x32, 0xb5, - 0xb1, 0xbb, 0x6b, 0x3b, 0x16, 0xb1, 0x50, 0x25, 0x78, 0xb8, 0x4b, 0x1f, 0xd6, 0x9f, 0x08, 0x69, - 0xf7, 0x9d, 0xa9, 0x4d, 0xac, 0x3d, 0xdb, 0xb1, 0xac, 0x73, 0xae, 0x5f, 0xbf, 0x11, 0x7a, 0xcc, - 0xfc, 0x84, 0xbd, 0x45, 0x9e, 0x0a, 0xe3, 0xfb, 0x78, 0xea, 0x3d, 0x7d, 0x62, 0xce, 0xd6, 0xd6, - 0x1c, 0x6d, 0xec, 0x3d, 0xde, 0x19, 0x58, 0xd6, 0x60, 0x84, 0xf7, 0xd8, 0xac, 0x37, 0x39, 0xdf, - 0x23, 0xc6, 0x18, 0xbb, 0x44, 0x1b, 0xdb, 0x42, 0x61, 0x6b, 0x60, 0x0d, 0x2c, 0x36, 0xdc, 0xa3, - 0x23, 0x2e, 0x95, 0x7f, 0x5b, 0x80, 0xbc, 0x82, 0x3f, 0x99, 0x60, 0x97, 0xa0, 0x7d, 0xc8, 0xe0, - 0xfe, 0xd0, 0xaa, 0x25, 0x6f, 0x26, 0x9f, 0x2d, 0xee, 0xdf, 0xd8, 0x9d, 0x59, 0xdc, 0xae, 0xd0, - 0x6b, 0xf5, 0x87, 0x56, 0x3b, 0xa1, 0x30, 0x5d, 0xf4, 0x0a, 0x64, 0xcf, 0x47, 0x13, 0x77, 0x58, - 0x4b, 0x31, 0xa3, 0x27, 0xe2, 0x8c, 0x6e, 0x53, 0xa5, 0x76, 0x42, 0xe1, 0xda, 0xf4, 0x55, 0x86, - 0x79, 0x6e, 0xd5, 0xd2, 0xcb, 0x5f, 0x75, 0x68, 0x9e, 0xb3, 0x57, 0x51, 0x5d, 0xd4, 0x00, 0x70, - 0x31, 0x51, 0x2d, 0x9b, 0x18, 0x96, 0x59, 0xcb, 0x30, 0xcb, 0x27, 0xe3, 0x2c, 0xcf, 0x30, 0xe9, - 0x30, 0xc5, 0x76, 0x42, 0x91, 0x5c, 0x6f, 0x42, 0x7d, 0x18, 0xa6, 0x41, 0xd4, 0xfe, 0x50, 0x33, - 0xcc, 0x5a, 0x76, 0xb9, 0x8f, 0x43, 0xd3, 0x20, 0x4d, 0xaa, 0x48, 0x7d, 0x18, 0xde, 0x84, 0x2e, - 0xf9, 0x93, 0x09, 0x76, 0xa6, 0xb5, 0xdc, 0xf2, 0x25, 0xff, 0x88, 0x2a, 0xd1, 0x25, 0x33, 0x6d, - 0xd4, 0x82, 0x62, 0x0f, 0x0f, 0x0c, 0x53, 0xed, 0x8d, 0xac, 0xfe, 0xfd, 0x5a, 0x9e, 0x19, 0xcb, - 0x71, 0xc6, 0x0d, 0xaa, 0xda, 0xa0, 0x9a, 0xed, 0x84, 0x02, 0x3d, 0x7f, 0x86, 0xde, 0x84, 0x42, - 0x7f, 0x88, 0xfb, 0xf7, 0x55, 0x72, 0x59, 0x2b, 0x30, 0x1f, 0x3b, 0x71, 0x3e, 0x9a, 0x54, 0xaf, - 0x7b, 0xd9, 0x4e, 0x28, 0xf9, 0x3e, 0x1f, 0xd2, 0xf5, 0xeb, 0x78, 0x64, 0x5c, 0x60, 0x87, 0xda, - 0x4b, 0xcb, 0xd7, 0xff, 0x0e, 0xd7, 0x64, 0x1e, 0x24, 0xdd, 0x9b, 0xa0, 0xb7, 0x40, 0xc2, 0xa6, - 0x2e, 0x96, 0x01, 0xcc, 0xc5, 0xcd, 0xd8, 0xb3, 0x62, 0xea, 0xde, 0x22, 0x0a, 0x58, 0x8c, 0xd1, - 0x6b, 0x90, 0xeb, 0x5b, 0xe3, 0xb1, 0x41, 0x6a, 0x45, 0x66, 0xbd, 0x1d, 0xbb, 0x00, 0xa6, 0xd5, - 0x4e, 0x28, 0x42, 0x1f, 0x9d, 0x40, 0x79, 0x64, 0xb8, 0x44, 0x75, 0x4d, 0xcd, 0x76, 0x87, 0x16, - 0x71, 0x6b, 0x1b, 0xcc, 0xc3, 0xd3, 0x71, 0x1e, 0x8e, 0x0d, 0x97, 0x9c, 0x79, 0xca, 0xed, 0x84, - 0x52, 0x1a, 0x85, 0x05, 0xd4, 0x9f, 0x75, 0x7e, 0x8e, 0x1d, 0xdf, 0x61, 0xad, 0xb4, 0xdc, 0x5f, - 0x87, 0x6a, 0x7b, 0xf6, 0xd4, 0x9f, 0x15, 0x16, 0xa0, 0x9f, 0xc1, 0xb5, 0x91, 0xa5, 0xe9, 0xbe, - 0x3b, 0xb5, 0x3f, 0x9c, 0x98, 0xf7, 0x6b, 0x65, 0xe6, 0xf4, 0xb9, 0xd8, 0x1f, 0x69, 0x69, 0xba, - 0xe7, 0xa2, 0x49, 0x0d, 0xda, 0x09, 0x65, 0x73, 0x34, 0x2b, 0x44, 0xf7, 0x60, 0x4b, 0xb3, 0xed, - 0xd1, 0x74, 0xd6, 0x7b, 0x85, 0x79, 0xbf, 0x15, 0xe7, 0xfd, 0x80, 0xda, 0xcc, 0xba, 0x47, 0xda, - 0x9c, 0xb4, 0x91, 0x87, 0xec, 0x85, 0x36, 0x9a, 0x60, 0xf9, 0xff, 0xa0, 0x18, 0x0a, 0x75, 0x54, - 0x83, 0xfc, 0x18, 0xbb, 0xae, 0x36, 0xc0, 0x0c, 0x19, 0x24, 0xc5, 0x9b, 0xca, 0x65, 0xd8, 0x08, - 0x87, 0xb7, 0x3c, 0xf6, 0x0d, 0x69, 0xe0, 0x52, 0xc3, 0x0b, 0xec, 0xb8, 0x34, 0x5a, 0x85, 0xa1, - 0x98, 0xa2, 0xa7, 0xa0, 0xc4, 0x8e, 0x8f, 0xea, 0x3d, 0xa7, 0xe8, 0x91, 0x51, 0x36, 0x98, 0xf0, - 0xae, 0x50, 0xda, 0x81, 0xa2, 0xbd, 0x6f, 0xfb, 0x2a, 0x69, 0xa6, 0x02, 0xf6, 0xbe, 0x2d, 0x14, - 0xe4, 0xef, 0x43, 0x75, 0x36, 0xda, 0x51, 0x15, 0xd2, 0xf7, 0xf1, 0x54, 0xbc, 0x8f, 0x0e, 0xd1, - 0x96, 0x58, 0x16, 0x7b, 0x87, 0xa4, 0x88, 0x35, 0xfe, 0x29, 0xe5, 0x1b, 0xfb, 0x61, 0x8e, 0x5e, - 0x83, 0x0c, 0x45, 0x4d, 0x01, 0x80, 0xf5, 0x5d, 0x0e, 0xa9, 0xbb, 0x1e, 0xa4, 0xee, 0x76, 0x3d, - 0x48, 0x6d, 0x14, 0xbe, 0xfa, 0x66, 0x27, 0xf1, 0xc5, 0x5f, 0x77, 0x92, 0x0a, 0xb3, 0x40, 0x8f, - 0xd1, 0xa8, 0xd4, 0x0c, 0x53, 0x35, 0x74, 0xf1, 0x9e, 0x3c, 0x9b, 0x1f, 0xea, 0xe8, 0x08, 0xaa, - 0x7d, 0xcb, 0x74, 0xb1, 0xe9, 0x4e, 0x5c, 0x95, 0x43, 0xb6, 0x80, 0xbd, 0xf9, 0xa8, 0x69, 0x7a, - 0x8a, 0xa7, 0x4c, 0x4f, 0xa9, 0xf4, 0xa3, 0x02, 0x74, 0x1b, 0xe0, 0x42, 0x1b, 0x19, 0xba, 0x46, - 0x2c, 0xc7, 0xad, 0x65, 0x6e, 0xa6, 0x17, 0xba, 0xb9, 0xeb, 0xa9, 0xdc, 0xb1, 0x75, 0x8d, 0xe0, - 0x46, 0x86, 0xfe, 0x5a, 0x25, 0x64, 0x89, 0x9e, 0x81, 0x8a, 0x66, 0xdb, 0xaa, 0x4b, 0x34, 0x82, - 0xd5, 0xde, 0x94, 0x60, 0x97, 0x81, 0xe1, 0x86, 0x52, 0xd2, 0x6c, 0xfb, 0x8c, 0x4a, 0x1b, 0x54, - 0x88, 0x9e, 0x86, 0x32, 0x05, 0x3e, 0x43, 0x1b, 0xa9, 0x43, 0x6c, 0x0c, 0x86, 0x84, 0x81, 0x5e, - 0x5a, 0x29, 0x09, 0x69, 0x9b, 0x09, 0x65, 0xdd, 0x3f, 0x08, 0x0c, 0xf4, 0x10, 0x82, 0x8c, 0xae, - 0x11, 0x8d, 0x6d, 0xe4, 0x86, 0xc2, 0xc6, 0x54, 0x66, 0x6b, 0x64, 0x28, 0xb6, 0x87, 0x8d, 0xd1, - 0x75, 0xc8, 0x09, 0xb7, 0x69, 0xe6, 0x56, 0xcc, 0xe8, 0x37, 0xb3, 0x1d, 0xeb, 0x02, 0x33, 0x94, - 0x2f, 0x28, 0x7c, 0x22, 0xff, 0x2a, 0x05, 0x9b, 0x73, 0xf0, 0x48, 0xfd, 0x0e, 0x35, 0x77, 0xe8, - 0xbd, 0x8b, 0x8e, 0xd1, 0xab, 0xd4, 0xaf, 0xa6, 0x63, 0x47, 0xa4, 0xa5, 0x5a, 0x78, 0x8b, 0x78, - 0xca, 0x6d, 0xb3, 0xe7, 0x62, 0x6b, 0x84, 0x36, 0xea, 0x40, 0x75, 0xa4, 0xb9, 0x44, 0xe5, 0x70, - 0xa3, 0x86, 0x52, 0xd4, 0x3c, 0xc8, 0x1e, 0x6b, 0x1e, 0x40, 0xd1, 0xc3, 0x2e, 0x1c, 0x95, 0x47, - 0x11, 0x29, 0x52, 0x60, 0xab, 0x37, 0xfd, 0x4c, 0x33, 0x89, 0x61, 0x62, 0x75, 0xee, 0xcb, 0x3d, - 0x36, 0xe7, 0xb4, 0x75, 0x61, 0xe8, 0xd8, 0xec, 0x7b, 0x9f, 0xec, 0x9a, 0x6f, 0xec, 0x7f, 0x52, - 0x57, 0x56, 0xa0, 0x1c, 0x05, 0x78, 0x54, 0x86, 0x14, 0xb9, 0x14, 0x1b, 0x90, 0x22, 0x97, 0xe8, - 0xff, 0x21, 0x43, 0x17, 0xc9, 0x16, 0x5f, 0x5e, 0x90, 0x5d, 0x85, 0x5d, 0x77, 0x6a, 0x63, 0x85, - 0x69, 0xca, 0xb2, 0x1f, 0x0d, 0x3e, 0xe8, 0xcf, 0x7a, 0x95, 0x9f, 0x83, 0xca, 0x0c, 0xaa, 0x87, - 0xbe, 0x5f, 0x32, 0xfc, 0xfd, 0xe4, 0x0a, 0x94, 0x22, 0x10, 0x2e, 0x5f, 0x87, 0xad, 0x45, 0x88, - 0x2c, 0x0f, 0x7d, 0x79, 0x04, 0x59, 0xd1, 0x2b, 0x50, 0xf0, 0x21, 0x99, 0x47, 0xe3, 0xfc, 0x5e, - 0x79, 0xca, 0x8a, 0xaf, 0x4a, 0xc3, 0x90, 0x1e, 0x6b, 0x76, 0x1e, 0x52, 0xec, 0x87, 0xe7, 0x35, - 0xdb, 0x6e, 0x6b, 0xee, 0x50, 0xfe, 0x08, 0x6a, 0x71, 0x70, 0x3b, 0xb3, 0x8c, 0x8c, 0x7f, 0x0c, - 0xaf, 0x43, 0xee, 0xdc, 0x72, 0xc6, 0x1a, 0x61, 0xce, 0x4a, 0x8a, 0x98, 0xd1, 0xe3, 0xc9, 0xa1, - 0x37, 0xcd, 0xc4, 0x7c, 0x22, 0xab, 0xf0, 0x58, 0x2c, 0xe4, 0x52, 0x13, 0xc3, 0xd4, 0x31, 0xdf, - 0xcf, 0x92, 0xc2, 0x27, 0x81, 0x23, 0xfe, 0x63, 0xf9, 0x84, 0xbe, 0xd6, 0x65, 0x6b, 0x65, 0xfe, - 0x25, 0x45, 0xcc, 0xe4, 0xbf, 0x17, 0xa0, 0xa0, 0x60, 0xd7, 0xa6, 0x98, 0x80, 0x1a, 0x20, 0xe1, - 0xcb, 0x3e, 0xe6, 0x64, 0x28, 0x19, 0x4b, 0x26, 0xb8, 0x76, 0xcb, 0xd3, 0xa4, 0x99, 0xdc, 0x37, - 0x43, 0x2f, 0x0b, 0xc2, 0x17, 0xcf, 0xdd, 0x84, 0x79, 0x98, 0xf1, 0xbd, 0xea, 0x31, 0xbe, 0x74, - 0x6c, 0xf2, 0xe6, 0x56, 0x33, 0x94, 0xef, 0x65, 0x41, 0xf9, 0x32, 0x2b, 0x5e, 0x16, 0xe1, 0x7c, - 0xcd, 0x08, 0xe7, 0xcb, 0xae, 0x58, 0x66, 0x0c, 0xe9, 0x6b, 0x46, 0x48, 0x5f, 0x6e, 0x85, 0x93, - 0x18, 0xd6, 0xf7, 0xaa, 0xc7, 0xfa, 0xf2, 0x2b, 0x96, 0x3d, 0x43, 0xfb, 0x6e, 0x47, 0x69, 0x1f, - 0xa7, 0x6c, 0x4f, 0xc5, 0x5a, 0xc7, 0xf2, 0xbe, 0x1f, 0x84, 0x78, 0x9f, 0x14, 0x4b, 0xba, 0xb8, - 0x93, 0x05, 0xc4, 0xaf, 0x19, 0x21, 0x7e, 0xb0, 0x62, 0x0f, 0x62, 0x98, 0xdf, 0xdb, 0x61, 0xe6, - 0x57, 0x8c, 0x25, 0x8f, 0xe2, 0xd0, 0x2c, 0xa2, 0x7e, 0xaf, 0xfb, 0xd4, 0x6f, 0x23, 0x96, 0xbb, - 0x8a, 0x35, 0xcc, 0x72, 0xbf, 0xce, 0x1c, 0xf7, 0xe3, 0x5c, 0xed, 0x99, 0x58, 0x17, 0x2b, 0xc8, - 0x5f, 0x67, 0x8e, 0xfc, 0x95, 0x57, 0x38, 0x5c, 0xc1, 0xfe, 0x7e, 0xbe, 0x98, 0xfd, 0xc5, 0xf3, - 0x33, 0xf1, 0x33, 0xd7, 0xa3, 0x7f, 0x6a, 0x0c, 0xfd, 0xab, 0x32, 0xf7, 0xcf, 0xc7, 0xba, 0xbf, - 0x3a, 0xff, 0x7b, 0x8e, 0xa6, 0xd9, 0x19, 0xe0, 0xa0, 0x50, 0x85, 0x1d, 0xc7, 0x72, 0x04, 0xb5, - 0xe2, 0x13, 0xf9, 0x59, 0x9a, 0xf8, 0x03, 0x90, 0x58, 0xc2, 0x15, 0x59, 0x4a, 0x08, 0x01, 0x83, - 0xfc, 0xfb, 0x64, 0x60, 0xcb, 0x72, 0x65, 0x98, 0x34, 0x48, 0x82, 0x34, 0x84, 0x28, 0x64, 0x2a, - 0x4a, 0x21, 0x77, 0xa0, 0x48, 0xa1, 0x7e, 0x86, 0x1d, 0x6a, 0xb6, 0xc7, 0x0e, 0xd1, 0x2d, 0xd8, - 0x64, 0xb9, 0x9c, 0x13, 0x4d, 0x81, 0xef, 0x19, 0x96, 0xa6, 0x2a, 0xf4, 0x01, 0x3f, 0x9c, 0x1c, - 0xe8, 0x5f, 0x84, 0x6b, 0x21, 0x5d, 0x3f, 0x85, 0x70, 0x4a, 0x54, 0xf5, 0xb5, 0x0f, 0x44, 0x2e, - 0x79, 0x3f, 0xd8, 0xa0, 0x80, 0x79, 0x22, 0xc8, 0xf4, 0x2d, 0x1d, 0x0b, 0x80, 0x67, 0x63, 0xca, - 0x46, 0x47, 0xd6, 0x40, 0xc0, 0x38, 0x1d, 0x52, 0x2d, 0x1f, 0x05, 0x25, 0x0e, 0x72, 0xf2, 0x1f, - 0x93, 0x81, 0xbf, 0x80, 0x8c, 0x2e, 0xe2, 0x8d, 0xc9, 0xff, 0x0e, 0x6f, 0x4c, 0x7d, 0x6b, 0xde, - 0x18, 0x4e, 0xb0, 0xe9, 0x68, 0x82, 0xfd, 0x67, 0x32, 0xf8, 0xc2, 0x3e, 0x0b, 0xfc, 0x76, 0x3b, - 0x12, 0x64, 0xcb, 0x2c, 0xfb, 0x5e, 0x22, 0x5b, 0x0a, 0x6e, 0x9f, 0x63, 0xef, 0x8d, 0x72, 0xfb, - 0x3c, 0xcf, 0x9f, 0x6c, 0x82, 0x5e, 0x03, 0x89, 0x35, 0x5d, 0x54, 0xcb, 0x76, 0x05, 0xe0, 0x3e, - 0x1e, 0x5e, 0x2b, 0xef, 0xad, 0xec, 0x9e, 0x52, 0x9d, 0x8e, 0xed, 0x2a, 0x05, 0x5b, 0x8c, 0x42, - 0x44, 0x40, 0x8a, 0xf0, 0xd1, 0x1b, 0x20, 0xd1, 0x5f, 0xef, 0xda, 0x5a, 0x1f, 0x33, 0xf0, 0x94, - 0x94, 0x40, 0x20, 0xdf, 0x03, 0x34, 0x0f, 0xdf, 0xa8, 0x0d, 0x39, 0x7c, 0x81, 0x4d, 0x42, 0xbf, - 0x1a, 0xdd, 0xee, 0xeb, 0x0b, 0xc8, 0x1e, 0x36, 0x49, 0xa3, 0x46, 0x37, 0xf9, 0x1f, 0xdf, 0xec, - 0x54, 0xb9, 0xf6, 0x0b, 0xd6, 0xd8, 0x20, 0x78, 0x6c, 0x93, 0xa9, 0x22, 0xec, 0xe5, 0xbf, 0xa4, - 0x28, 0xf3, 0x8a, 0x40, 0xfb, 0xc2, 0xbd, 0xf5, 0x02, 0x28, 0x15, 0x62, 0xdd, 0xeb, 0xed, 0xf7, - 0x36, 0xc0, 0x40, 0x73, 0xd5, 0x4f, 0x35, 0x93, 0x60, 0x5d, 0x6c, 0x7a, 0x48, 0x82, 0xea, 0x50, - 0xa0, 0xb3, 0x89, 0x8b, 0x75, 0x51, 0x00, 0xf8, 0xf3, 0xd0, 0x3a, 0xf3, 0xdf, 0x6d, 0x9d, 0xd1, - 0x5d, 0x2e, 0xcc, 0xec, 0x72, 0x88, 0x15, 0x49, 0x61, 0x56, 0x44, 0x7f, 0x9b, 0xed, 0x18, 0x96, - 0x63, 0x90, 0x29, 0xfb, 0x34, 0x69, 0xc5, 0x9f, 0xd3, 0x3a, 0x73, 0x8c, 0xc7, 0xb6, 0x65, 0x8d, - 0x54, 0x0e, 0x5e, 0x45, 0x66, 0xba, 0x21, 0x84, 0x2d, 0x86, 0x61, 0xbf, 0x4e, 0x05, 0xe1, 0x17, - 0xb0, 0xdf, 0xff, 0xb9, 0x0d, 0x96, 0x7f, 0xc3, 0x4a, 0xe2, 0x68, 0xf2, 0x46, 0x67, 0xb0, 0xe9, - 0x87, 0xbf, 0x3a, 0x61, 0xb0, 0xe0, 0x1d, 0xe8, 0x75, 0xf1, 0xa3, 0x7a, 0x11, 0x15, 0xbb, 0xe8, - 0xc7, 0xf0, 0xe8, 0x0c, 0xb4, 0xf9, 0xae, 0x53, 0x6b, 0x22, 0xdc, 0x23, 0x51, 0x84, 0xf3, 0x3c, - 0x07, 0x7b, 0x95, 0xfe, 0x8e, 0x41, 0x77, 0x48, 0xab, 0xac, 0x30, 0x15, 0x59, 0xf8, 0xf5, 0x9f, - 0x82, 0x92, 0x83, 0x09, 0x2d, 0xfc, 0x23, 0x75, 0xec, 0x06, 0x17, 0x8a, 0xea, 0xf8, 0x14, 0x1e, - 0x59, 0x48, 0x49, 0xd0, 0xf7, 0x40, 0x0a, 0xd8, 0x4c, 0x32, 0xa6, 0x24, 0xf4, 0xcb, 0x9c, 0x40, - 0x57, 0xfe, 0x43, 0x32, 0x70, 0x19, 0x2d, 0x9c, 0x5a, 0x90, 0x73, 0xb0, 0x3b, 0x19, 0xf1, 0x52, - 0xa6, 0xbc, 0xff, 0xe2, 0x7a, 0x64, 0x86, 0x4a, 0x27, 0x23, 0xa2, 0x08, 0x63, 0xf9, 0x1e, 0xe4, - 0xb8, 0x04, 0x15, 0x21, 0x7f, 0xe7, 0xe4, 0xe8, 0xa4, 0xf3, 0xc1, 0x49, 0x35, 0x81, 0x00, 0x72, - 0x07, 0xcd, 0x66, 0xeb, 0xb4, 0x5b, 0x4d, 0x22, 0x09, 0xb2, 0x07, 0x8d, 0x8e, 0xd2, 0xad, 0xa6, - 0xa8, 0x58, 0x69, 0xbd, 0xd7, 0x6a, 0x76, 0xab, 0x69, 0xb4, 0x09, 0x25, 0x3e, 0x56, 0x6f, 0x77, - 0x94, 0xf7, 0x0f, 0xba, 0xd5, 0x4c, 0x48, 0x74, 0xd6, 0x3a, 0x79, 0xa7, 0xa5, 0x54, 0xb3, 0xf2, - 0x4b, 0xb4, 0x56, 0x8a, 0xa1, 0x3f, 0x41, 0x55, 0x94, 0x0c, 0x55, 0x45, 0xf2, 0xef, 0x52, 0x50, - 0x8f, 0xe7, 0x34, 0xe8, 0xbd, 0x99, 0x85, 0xef, 0x5f, 0x81, 0x10, 0xcd, 0xac, 0x1e, 0x3d, 0x0d, - 0x65, 0x07, 0x9f, 0x63, 0xd2, 0x1f, 0x72, 0x8e, 0xc5, 0x33, 0x66, 0x49, 0x29, 0x09, 0x29, 0x33, - 0x72, 0xb9, 0xda, 0xc7, 0xb8, 0x4f, 0x54, 0x0e, 0x45, 0xfc, 0xd0, 0x49, 0x54, 0x8d, 0x4a, 0xcf, - 0xb8, 0x50, 0xfe, 0xe8, 0x4a, 0x7b, 0x29, 0x41, 0x56, 0x69, 0x75, 0x95, 0x9f, 0x54, 0xd3, 0x08, - 0x41, 0x99, 0x0d, 0xd5, 0xb3, 0x93, 0x83, 0xd3, 0xb3, 0x76, 0x87, 0xee, 0xe5, 0x35, 0xa8, 0x78, - 0x7b, 0xe9, 0x09, 0xb3, 0xf2, 0xbf, 0x93, 0x50, 0x99, 0x09, 0x10, 0xb4, 0x0f, 0x59, 0xce, 0xd3, - 0xe3, 0xba, 0xf9, 0x2c, 0xbe, 0x45, 0x34, 0x71, 0x55, 0xf4, 0x26, 0x14, 0xb0, 0x68, 0x40, 0x2c, - 0x0a, 0x44, 0xde, 0x38, 0xf1, 0x5a, 0x14, 0xc2, 0xd4, 0xb7, 0x40, 0x6f, 0x81, 0xe4, 0x47, 0xba, - 0x28, 0x0e, 0x9f, 0x9c, 0x37, 0xf7, 0x31, 0x42, 0xd8, 0x07, 0x36, 0xe8, 0xf5, 0x80, 0xec, 0x65, - 0xe6, 0xab, 0x03, 0x61, 0xce, 0x15, 0x84, 0xb1, 0xa7, 0x2f, 0x37, 0xa1, 0x18, 0x5a, 0x0f, 0x7a, - 0x1c, 0xa4, 0xb1, 0x76, 0x29, 0x1a, 0x5b, 0xbc, 0x35, 0x51, 0x18, 0x6b, 0x97, 0xbc, 0xa7, 0xf5, - 0x28, 0xe4, 0xe9, 0xc3, 0x81, 0xc6, 0xd1, 0x26, 0xad, 0xe4, 0xc6, 0xda, 0xe5, 0xbb, 0x9a, 0x2b, - 0x7f, 0x08, 0xe5, 0x68, 0x53, 0x87, 0x9e, 0x44, 0xc7, 0x9a, 0x98, 0x3a, 0xf3, 0x91, 0x55, 0xf8, - 0x04, 0xbd, 0x02, 0xd9, 0x0b, 0x8b, 0x83, 0xd5, 0xe2, 0x90, 0xbd, 0x6b, 0x11, 0x1c, 0x6a, 0x0a, - 0x71, 0x6d, 0xf9, 0x33, 0xc8, 0x32, 0xf0, 0xa1, 0x40, 0xc2, 0xda, 0x33, 0x82, 0xe8, 0xd2, 0x31, - 0xfa, 0x10, 0x40, 0x23, 0xc4, 0x31, 0x7a, 0x93, 0xc0, 0xf1, 0xce, 0x62, 0xf0, 0x3a, 0xf0, 0xf4, - 0x1a, 0x37, 0x04, 0x8a, 0x6d, 0x05, 0xa6, 0x21, 0x24, 0x0b, 0x39, 0x94, 0x4f, 0xa0, 0x1c, 0xb5, - 0x0d, 0x37, 0x4a, 0x37, 0x16, 0x34, 0x4a, 0x7d, 0x32, 0xe5, 0x53, 0xb1, 0x34, 0x6f, 0xc5, 0xb1, - 0x89, 0xfc, 0x79, 0x12, 0x0a, 0xdd, 0x4b, 0x71, 0xac, 0x63, 0xba, 0x40, 0x81, 0x69, 0x2a, 0xdc, - 0xf3, 0xe0, 0x6d, 0xa5, 0xb4, 0xdf, 0xac, 0x7a, 0xdb, 0x0f, 0xdc, 0xcc, 0xba, 0x55, 0xa9, 0xd7, - 0xb5, 0x13, 0x60, 0xf5, 0x06, 0x48, 0xfe, 0xa9, 0xa2, 0x15, 0x83, 0xa6, 0xeb, 0x0e, 0x76, 0x5d, - 0xb1, 0x36, 0x6f, 0xca, 0x9a, 0x8a, 0xd6, 0xa7, 0xa2, 0xab, 0x92, 0x56, 0xf8, 0x44, 0xd6, 0xa1, - 0x32, 0x93, 0xb6, 0xd0, 0x1b, 0x90, 0xb7, 0x27, 0x3d, 0xd5, 0xdb, 0x9e, 0x99, 0xe0, 0xf1, 0xd8, - 0xe3, 0xa4, 0x37, 0x32, 0xfa, 0x47, 0x78, 0xea, 0xfd, 0x18, 0x7b, 0xd2, 0x3b, 0xe2, 0xbb, 0xc8, - 0xdf, 0x92, 0x0a, 0xbf, 0xe5, 0x02, 0x0a, 0xde, 0xa1, 0x40, 0x3f, 0x0c, 0xc7, 0x89, 0xd7, 0x6a, - 0x8e, 0x4d, 0xa5, 0xc2, 0x7d, 0x28, 0x4c, 0x6e, 0xc1, 0xa6, 0x6b, 0x0c, 0x4c, 0xac, 0xab, 0x41, - 0xcd, 0xc2, 0xde, 0x56, 0x50, 0x2a, 0xfc, 0xc1, 0xb1, 0x57, 0xb0, 0xc8, 0xff, 0x4a, 0x42, 0xc1, - 0x0b, 0x58, 0xf4, 0x52, 0xe8, 0xdc, 0x95, 0x17, 0x74, 0x60, 0x3c, 0xc5, 0xa0, 0x2f, 0x18, 0xfd, - 0xad, 0xa9, 0xab, 0xff, 0xd6, 0xb8, 0x06, 0xaf, 0xd7, 0x69, 0xcf, 0x5c, 0xb9, 0xd3, 0xfe, 0x02, - 0x20, 0x62, 0x11, 0x6d, 0xa4, 0x5e, 0x58, 0xc4, 0x30, 0x07, 0x2a, 0xdf, 0x6c, 0xce, 0xa8, 0xaa, - 0xec, 0xc9, 0x5d, 0xf6, 0xe0, 0x94, 0xed, 0xfb, 0x2f, 0x92, 0x50, 0xf0, 0x73, 0xe3, 0x55, 0xdb, - 0x7c, 0xd7, 0x21, 0x27, 0xe0, 0x9f, 0xf7, 0xf9, 0xc4, 0xcc, 0xef, 0x38, 0x67, 0x42, 0x1d, 0xe7, - 0x3a, 0x14, 0xc6, 0x98, 0x68, 0x8c, 0x20, 0xf0, 0xb2, 0xd1, 0x9f, 0xdf, 0x7a, 0x1d, 0x8a, 0xa1, - 0x8e, 0x2b, 0x8d, 0xbc, 0x93, 0xd6, 0x07, 0xd5, 0x44, 0x3d, 0xff, 0xf9, 0x97, 0x37, 0xd3, 0x27, - 0xf8, 0x53, 0x7a, 0x66, 0x95, 0x56, 0xb3, 0xdd, 0x6a, 0x1e, 0x55, 0x93, 0xf5, 0xe2, 0xe7, 0x5f, - 0xde, 0xcc, 0x2b, 0x98, 0x35, 0x6e, 0x6e, 0xb5, 0x61, 0x23, 0xfc, 0x55, 0xa2, 0x19, 0x04, 0x41, - 0xf9, 0x9d, 0x3b, 0xa7, 0xc7, 0x87, 0xcd, 0x83, 0x6e, 0x4b, 0xbd, 0xdb, 0xe9, 0xb6, 0xaa, 0x49, - 0xf4, 0x28, 0x5c, 0x3b, 0x3e, 0x7c, 0xb7, 0xdd, 0x55, 0x9b, 0xc7, 0x87, 0xad, 0x93, 0xae, 0x7a, - 0xd0, 0xed, 0x1e, 0x34, 0x8f, 0xaa, 0xa9, 0xfd, 0x5f, 0x02, 0x54, 0x0e, 0x1a, 0xcd, 0x43, 0x9a, - 0xfd, 0x8c, 0xbe, 0x26, 0x1a, 0x63, 0x19, 0x56, 0xb5, 0x2f, 0xbd, 0xea, 0xad, 0x2f, 0xef, 0x0b, - 0xa2, 0xdb, 0x90, 0x65, 0x05, 0x3d, 0x5a, 0x7e, 0xf7, 0x5b, 0x5f, 0xd1, 0x28, 0xa4, 0x3f, 0x86, - 0x85, 0xc7, 0xd2, 0xcb, 0xe0, 0xfa, 0xf2, 0xbe, 0x21, 0x52, 0x40, 0x0a, 0x2a, 0xf2, 0xd5, 0x97, - 0xc3, 0xf5, 0x35, 0x7a, 0x89, 0xd4, 0x67, 0x50, 0x16, 0xac, 0xbe, 0x2c, 0xad, 0xaf, 0x01, 0x60, - 0xe8, 0x18, 0xf2, 0x5e, 0x25, 0xb7, 0xea, 0xfa, 0xb6, 0xbe, 0xb2, 0xcf, 0x47, 0x3f, 0x01, 0xaf, - 0xb8, 0x97, 0xdf, 0x45, 0xd7, 0x57, 0x34, 0x2d, 0xd1, 0x21, 0xe4, 0x04, 0xd7, 0x5d, 0x71, 0x25, - 0x5b, 0x5f, 0xd5, 0xb7, 0xa3, 0x9b, 0x16, 0xb4, 0x32, 0x56, 0xdf, 0xb0, 0xd7, 0xd7, 0xe8, 0xc7, - 0xa2, 0x3b, 0x00, 0xa1, 0xfa, 0x7a, 0x8d, 0xab, 0xf3, 0xfa, 0x3a, 0x7d, 0x56, 0xd4, 0x81, 0x82, - 0x5f, 0xee, 0xac, 0xbc, 0xc8, 0xae, 0xaf, 0x6e, 0x78, 0xa2, 0x7b, 0x50, 0x8a, 0xf2, 0xfc, 0xf5, - 0xae, 0xa7, 0xeb, 0x6b, 0x76, 0x32, 0xa9, 0xff, 0x28, 0xe9, 0x5f, 0xef, 0xba, 0xba, 0xbe, 0x66, - 0x63, 0x13, 0x7d, 0x0c, 0x9b, 0xf3, 0xa4, 0x7c, 0xfd, 0xdb, 0xeb, 0xfa, 0x15, 0x5a, 0x9d, 0x68, - 0x0c, 0x68, 0x01, 0x99, 0xbf, 0xc2, 0x65, 0x76, 0xfd, 0x2a, 0x9d, 0xcf, 0x46, 0xeb, 0xab, 0x07, - 0xdb, 0xc9, 0xaf, 0x1f, 0x6c, 0x27, 0xff, 0xf6, 0x60, 0x3b, 0xf9, 0xc5, 0xc3, 0xed, 0xc4, 0xd7, - 0x0f, 0xb7, 0x13, 0x7f, 0x7e, 0xb8, 0x9d, 0xf8, 0xe9, 0xf3, 0x03, 0x83, 0x0c, 0x27, 0xbd, 0xdd, - 0xbe, 0x35, 0xde, 0x0b, 0xff, 0xd3, 0x66, 0xd1, 0xbf, 0x7f, 0x7a, 0x39, 0x96, 0xa8, 0x5e, 0xfe, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x2d, 0x07, 0xd8, 0x1d, 0x24, 0x00, 0x00, + proto.RegisterEnum("cometbft.v034x.abci.CheckTxType", CheckTxType_name, CheckTxType_value) + proto.RegisterEnum("cometbft.v034x.abci.EvidenceType", EvidenceType_name, EvidenceType_value) + proto.RegisterEnum("cometbft.v034x.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) + proto.RegisterEnum("cometbft.v034x.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterType((*Request)(nil), "cometbft.v034x.abci.Request") + proto.RegisterType((*RequestEcho)(nil), "cometbft.v034x.abci.RequestEcho") + proto.RegisterType((*RequestFlush)(nil), "cometbft.v034x.abci.RequestFlush") + proto.RegisterType((*RequestInfo)(nil), "cometbft.v034x.abci.RequestInfo") + proto.RegisterType((*RequestSetOption)(nil), "cometbft.v034x.abci.RequestSetOption") + proto.RegisterType((*RequestInitChain)(nil), "cometbft.v034x.abci.RequestInitChain") + proto.RegisterType((*RequestQuery)(nil), "cometbft.v034x.abci.RequestQuery") + proto.RegisterType((*RequestBeginBlock)(nil), "cometbft.v034x.abci.RequestBeginBlock") + proto.RegisterType((*RequestCheckTx)(nil), "cometbft.v034x.abci.RequestCheckTx") + proto.RegisterType((*RequestDeliverTx)(nil), "cometbft.v034x.abci.RequestDeliverTx") + proto.RegisterType((*RequestEndBlock)(nil), "cometbft.v034x.abci.RequestEndBlock") + proto.RegisterType((*RequestCommit)(nil), "cometbft.v034x.abci.RequestCommit") + proto.RegisterType((*RequestListSnapshots)(nil), "cometbft.v034x.abci.RequestListSnapshots") + proto.RegisterType((*RequestOfferSnapshot)(nil), "cometbft.v034x.abci.RequestOfferSnapshot") + proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "cometbft.v034x.abci.RequestLoadSnapshotChunk") + proto.RegisterType((*RequestApplySnapshotChunk)(nil), "cometbft.v034x.abci.RequestApplySnapshotChunk") + proto.RegisterType((*Response)(nil), "cometbft.v034x.abci.Response") + proto.RegisterType((*ResponseException)(nil), "cometbft.v034x.abci.ResponseException") + proto.RegisterType((*ResponseEcho)(nil), "cometbft.v034x.abci.ResponseEcho") + proto.RegisterType((*ResponseFlush)(nil), "cometbft.v034x.abci.ResponseFlush") + proto.RegisterType((*ResponseInfo)(nil), "cometbft.v034x.abci.ResponseInfo") + proto.RegisterType((*ResponseSetOption)(nil), "cometbft.v034x.abci.ResponseSetOption") + proto.RegisterType((*ResponseInitChain)(nil), "cometbft.v034x.abci.ResponseInitChain") + proto.RegisterType((*ResponseQuery)(nil), "cometbft.v034x.abci.ResponseQuery") + proto.RegisterType((*ResponseBeginBlock)(nil), "cometbft.v034x.abci.ResponseBeginBlock") + proto.RegisterType((*ResponseCheckTx)(nil), "cometbft.v034x.abci.ResponseCheckTx") + proto.RegisterType((*ResponseDeliverTx)(nil), "cometbft.v034x.abci.ResponseDeliverTx") + proto.RegisterType((*ResponseEndBlock)(nil), "cometbft.v034x.abci.ResponseEndBlock") + proto.RegisterType((*ResponseCommit)(nil), "cometbft.v034x.abci.ResponseCommit") + proto.RegisterType((*ResponseListSnapshots)(nil), "cometbft.v034x.abci.ResponseListSnapshots") + proto.RegisterType((*ResponseOfferSnapshot)(nil), "cometbft.v034x.abci.ResponseOfferSnapshot") + proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "cometbft.v034x.abci.ResponseLoadSnapshotChunk") + proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "cometbft.v034x.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ConsensusParams)(nil), "cometbft.v034x.abci.ConsensusParams") + proto.RegisterType((*BlockParams)(nil), "cometbft.v034x.abci.BlockParams") + proto.RegisterType((*LastCommitInfo)(nil), "cometbft.v034x.abci.LastCommitInfo") + proto.RegisterType((*Event)(nil), "cometbft.v034x.abci.Event") + proto.RegisterType((*EventAttribute)(nil), "cometbft.v034x.abci.EventAttribute") + proto.RegisterType((*TxResult)(nil), "cometbft.v034x.abci.TxResult") + proto.RegisterType((*Validator)(nil), "cometbft.v034x.abci.Validator") + proto.RegisterType((*ValidatorUpdate)(nil), "cometbft.v034x.abci.ValidatorUpdate") + proto.RegisterType((*VoteInfo)(nil), "cometbft.v034x.abci.VoteInfo") + proto.RegisterType((*Evidence)(nil), "cometbft.v034x.abci.Evidence") + proto.RegisterType((*Snapshot)(nil), "cometbft.v034x.abci.Snapshot") +} + +func init() { proto.RegisterFile("cometbft/v034x/abci/types.proto", fileDescriptor_fc134a5952b72ac9) } + +var fileDescriptor_fc134a5952b72ac9 = []byte{ + // 2812 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x93, 0x23, 0xc5, + 0xf1, 0xd7, 0x5b, 0xea, 0x9c, 0x91, 0x46, 0x53, 0xbb, 0x2c, 0x42, 0x7f, 0xfe, 0x33, 0x4b, 0xaf, + 0x97, 0xc7, 0x06, 0xcc, 0xc0, 0x82, 0xc1, 0xbb, 0x40, 0x98, 0x91, 0x56, 0xbb, 0x9a, 0x9d, 0x41, + 0xb3, 0xf4, 0x88, 0xd9, 0x80, 0xb0, 0xdd, 0x94, 0xa4, 0x1a, 0xa9, 0xbd, 0x52, 0x77, 0xd3, 0x5d, + 0x9a, 0x1d, 0x71, 0xf0, 0xc1, 0x11, 0x3e, 0x98, 0x83, 0xcd, 0xcd, 0x17, 0x73, 0xf4, 0x77, 0xf0, + 0xd9, 0x27, 0x22, 0x1c, 0x8e, 0x20, 0xc2, 0x17, 0x9f, 0x30, 0x01, 0x37, 0x7f, 0x05, 0x2e, 0x8e, + 0x7a, 0xf4, 0x4b, 0xa3, 0x47, 0x0b, 0xb8, 0xf9, 0xd6, 0x95, 0xca, 0xcc, 0xea, 0xca, 0xae, 0xfa, + 0xe5, 0x2f, 0xb3, 0x04, 0xdb, 0x5d, 0x6b, 0x44, 0x68, 0xe7, 0x94, 0xee, 0x9e, 0xbd, 0xfc, 0xea, + 0x6b, 0xe7, 0xbb, 0xb8, 0xd3, 0x35, 0x76, 0xe9, 0xc4, 0x26, 0xee, 0x8e, 0xed, 0x58, 0xd4, 0x42, + 0x97, 0x3c, 0x85, 0x1d, 0xae, 0xb0, 0xc3, 0x14, 0xaa, 0xcf, 0x4c, 0x59, 0x75, 0x9d, 0x89, 0x4d, + 0xad, 0x5d, 0xdb, 0xb1, 0xac, 0x53, 0x61, 0x57, 0xbd, 0x3a, 0xa5, 0xc2, 0x7d, 0x86, 0x3d, 0x5f, + 0xd0, 0x90, 0x4e, 0x1e, 0x91, 0x89, 0xa7, 0xf1, 0xcc, 0x4c, 0x1f, 0x36, 0x76, 0xf0, 0xc8, 0x53, + 0xd9, 0xee, 0x5b, 0x56, 0x7f, 0x48, 0x76, 0xf9, 0xa8, 0x33, 0x3e, 0xdd, 0xa5, 0xc6, 0x88, 0xb8, + 0x14, 0x8f, 0x6c, 0xa9, 0x70, 0xb9, 0x6f, 0xf5, 0x2d, 0xfe, 0xb8, 0xcb, 0x9e, 0x84, 0x54, 0xfd, + 0x47, 0x01, 0xf2, 0x1a, 0xf9, 0x78, 0x4c, 0x5c, 0x8a, 0x5e, 0x87, 0x0c, 0xe9, 0x0e, 0xac, 0x4a, + 0xf2, 0x6a, 0xf2, 0xf9, 0xb5, 0x9b, 0x57, 0x77, 0x66, 0x2c, 0x78, 0x47, 0xea, 0x36, 0xba, 0x03, + 0xab, 0x99, 0xd0, 0xb8, 0x3e, 0xba, 0x05, 0xd9, 0xd3, 0xe1, 0xd8, 0x1d, 0x54, 0x52, 0xdc, 0xf0, + 0x99, 0x45, 0x86, 0x77, 0x99, 0x62, 0x33, 0xa1, 0x09, 0x0b, 0x36, 0xa5, 0x61, 0x9e, 0x5a, 0x95, + 0xf4, 0xf2, 0x29, 0xf7, 0xcd, 0x53, 0x3e, 0x25, 0xd3, 0x47, 0x77, 0x01, 0x5c, 0x42, 0x75, 0xcb, + 0xa6, 0x86, 0x65, 0x56, 0x32, 0xdc, 0xfa, 0xfa, 0x22, 0xeb, 0x63, 0x42, 0x8f, 0xb8, 0x72, 0x33, + 0xa1, 0x29, 0xae, 0x37, 0x60, 0x7e, 0x0c, 0xd3, 0xa0, 0x7a, 0x77, 0x80, 0x0d, 0xb3, 0x92, 0x5d, + 0xee, 0x67, 0xdf, 0x34, 0x68, 0x9d, 0x29, 0x33, 0x3f, 0x86, 0x37, 0x60, 0x21, 0xf8, 0x78, 0x4c, + 0x9c, 0x49, 0x25, 0xb7, 0x3c, 0x04, 0xef, 0x31, 0x45, 0x16, 0x02, 0x6e, 0x81, 0xf6, 0x61, 0xad, + 0x43, 0xfa, 0x86, 0xa9, 0x77, 0x86, 0x56, 0xf7, 0x51, 0x25, 0xcf, 0x1d, 0x3c, 0xbb, 0xc8, 0x41, + 0x8d, 0xa9, 0xd7, 0x98, 0x76, 0x33, 0xa1, 0x41, 0xc7, 0x1f, 0xa1, 0x77, 0xa0, 0xd0, 0x1d, 0x90, + 0xee, 0x23, 0x9d, 0x9e, 0x57, 0x0a, 0xdc, 0xcf, 0xb5, 0x45, 0x7e, 0xea, 0x4c, 0xb7, 0x7d, 0xde, + 0x4c, 0x68, 0xf9, 0xae, 0x78, 0x64, 0xf1, 0xe8, 0x91, 0xa1, 0x71, 0x46, 0x1c, 0xe6, 0x43, 0x59, + 0x1e, 0x8f, 0x3b, 0x42, 0x9b, 0x7b, 0x51, 0x7a, 0xde, 0x00, 0xd5, 0x41, 0x21, 0x66, 0x4f, 0x2e, + 0x09, 0xb8, 0x9b, 0x9f, 0x2c, 0xdc, 0x4f, 0x66, 0xcf, 0x5b, 0x50, 0x81, 0xc8, 0x67, 0xf4, 0x16, + 0xe4, 0xba, 0xd6, 0x68, 0x64, 0xd0, 0xca, 0x1a, 0xf7, 0xa0, 0x2e, 0x5c, 0x0c, 0xd7, 0x6c, 0x26, + 0x34, 0x69, 0x83, 0x34, 0x28, 0x0d, 0x0d, 0x97, 0xea, 0xae, 0x89, 0x6d, 0x77, 0x60, 0x51, 0xb7, + 0xb2, 0xce, 0xbd, 0xbc, 0xb0, 0xc8, 0xcb, 0xa1, 0xe1, 0xd2, 0x63, 0xcf, 0xa0, 0x99, 0xd0, 0x8a, + 0xc3, 0xb0, 0x80, 0xf9, 0xb4, 0x4e, 0x4f, 0x89, 0xe3, 0x3b, 0xad, 0x14, 0x97, 0xfb, 0x3c, 0x62, + 0x16, 0x9e, 0x0f, 0xe6, 0xd3, 0x0a, 0x0b, 0x90, 0x0e, 0x97, 0x86, 0x16, 0xee, 0xf9, 0x2e, 0xf5, + 0xee, 0x60, 0x6c, 0x3e, 0xaa, 0x94, 0xb8, 0xe3, 0x97, 0x16, 0xbe, 0xac, 0x85, 0x7b, 0x9e, 0x9b, + 0x3a, 0x33, 0x6a, 0x26, 0xb4, 0xcd, 0xe1, 0xb4, 0x10, 0x75, 0xe0, 0x32, 0xb6, 0xed, 0xe1, 0x64, + 0x7a, 0x86, 0x0d, 0x3e, 0xc3, 0xce, 0xa2, 0x19, 0xf6, 0x98, 0xdd, 0xf4, 0x14, 0x08, 0x5f, 0x90, + 0xd6, 0xf2, 0x90, 0x3d, 0xc3, 0xc3, 0x31, 0x51, 0x9f, 0x83, 0xb5, 0x10, 0x44, 0xa0, 0x0a, 0xe4, + 0x47, 0xc4, 0x75, 0x71, 0x9f, 0x70, 0x54, 0x51, 0x34, 0x6f, 0xa8, 0x96, 0x60, 0x3d, 0x0c, 0x09, + 0xea, 0xc8, 0x37, 0x64, 0x07, 0x9d, 0x19, 0x9e, 0x11, 0xc7, 0x65, 0xa7, 0x5b, 0x1a, 0xca, 0x21, + 0xba, 0x06, 0x45, 0xbe, 0xad, 0x74, 0xef, 0x77, 0x86, 0x3a, 0x19, 0x6d, 0x9d, 0x0b, 0x4f, 0xa4, + 0xd2, 0x36, 0xac, 0xd9, 0x37, 0x6d, 0x5f, 0x25, 0xcd, 0x55, 0xc0, 0xbe, 0x69, 0x4b, 0x05, 0xf5, + 0x36, 0x94, 0xa7, 0x91, 0x01, 0x95, 0x21, 0xfd, 0x88, 0x4c, 0xe4, 0x7c, 0xec, 0x11, 0x5d, 0x96, + 0xcb, 0xe2, 0x73, 0x28, 0x9a, 0x5c, 0xe3, 0x3f, 0x53, 0xbe, 0xb1, 0x0f, 0x07, 0xe8, 0x67, 0x90, + 0x61, 0x88, 0x2b, 0xc1, 0xb3, 0xba, 0x23, 0xe0, 0x78, 0xc7, 0x83, 0xe3, 0x9d, 0xb6, 0x07, 0xc7, + 0xb5, 0xc2, 0x17, 0x5f, 0x6d, 0x27, 0x3e, 0xfb, 0xf7, 0x76, 0x52, 0xe3, 0x16, 0xe8, 0x29, 0x76, + 0x6a, 0xb1, 0x61, 0xea, 0x46, 0x4f, 0xce, 0x93, 0xe7, 0xe3, 0xfd, 0x1e, 0x3a, 0x82, 0x72, 0xd7, + 0x32, 0x5d, 0x62, 0xba, 0x63, 0x57, 0x17, 0x70, 0x2f, 0xa1, 0x72, 0xf6, 0x69, 0xaa, 0x7b, 0xca, + 0x0f, 0xb8, 0xae, 0xb6, 0xd1, 0x8d, 0x0a, 0xd0, 0x7d, 0x80, 0x33, 0x3c, 0x34, 0x7a, 0x98, 0x5a, + 0x8e, 0x5b, 0xc9, 0x5c, 0x4d, 0xcf, 0x75, 0x75, 0xe2, 0xa9, 0xbd, 0x6f, 0xf7, 0x30, 0x25, 0xb5, + 0x0c, 0x7b, 0x6b, 0x2d, 0x64, 0x8d, 0x9e, 0x85, 0x0d, 0x6c, 0xdb, 0xba, 0x4b, 0x31, 0x25, 0x7a, + 0x67, 0x42, 0x89, 0xcb, 0x01, 0x74, 0x5d, 0x2b, 0x62, 0xdb, 0x3e, 0x66, 0xd2, 0x1a, 0x13, 0xa2, + 0xeb, 0x50, 0x62, 0x40, 0x69, 0xe0, 0xa1, 0x3e, 0x20, 0x46, 0x7f, 0x40, 0x39, 0x48, 0xa6, 0xb5, + 0xa2, 0x94, 0x36, 0xb9, 0x50, 0xed, 0xf9, 0x1b, 0x82, 0x03, 0x24, 0x42, 0x90, 0xe9, 0x61, 0x8a, + 0x79, 0x40, 0xd7, 0x35, 0xfe, 0xcc, 0x64, 0x36, 0xa6, 0x03, 0x19, 0x26, 0xfe, 0x8c, 0xae, 0x40, + 0x4e, 0xba, 0x4d, 0x73, 0xb7, 0x72, 0xc4, 0xbe, 0x9d, 0xed, 0x58, 0x67, 0x84, 0x67, 0x87, 0x82, + 0x26, 0x06, 0xea, 0x67, 0x29, 0xd8, 0xbc, 0x00, 0xa3, 0xcc, 0xef, 0x00, 0xbb, 0x03, 0x6f, 0x2e, + 0xf6, 0x8c, 0x6e, 0x33, 0xbf, 0xb8, 0x47, 0x1c, 0x99, 0xd6, 0x9e, 0x9e, 0x0e, 0x93, 0x48, 0xe1, + 0x4d, 0xae, 0x23, 0xc3, 0x23, 0x2d, 0xd0, 0x31, 0x94, 0x87, 0xd8, 0xa5, 0xba, 0x80, 0x22, 0x3d, + 0x94, 0xe2, 0x66, 0x03, 0xf2, 0x21, 0xf6, 0x00, 0x8c, 0x6d, 0x7e, 0xe9, 0xac, 0x34, 0x8c, 0x48, + 0xd1, 0x09, 0x5c, 0xee, 0x4c, 0x3e, 0xc1, 0x26, 0x35, 0x4c, 0xa2, 0x5f, 0xf8, 0x8a, 0xff, 0x3f, + 0xd3, 0x71, 0xe3, 0xcc, 0xe8, 0x11, 0xb3, 0xeb, 0x7d, 0xbe, 0x4b, 0xbe, 0x03, 0xff, 0xf3, 0xba, + 0xea, 0x09, 0x94, 0xa2, 0x09, 0x01, 0x95, 0x20, 0x45, 0xcf, 0x65, 0x30, 0x52, 0xf4, 0x1c, 0xbd, + 0x06, 0x19, 0xb6, 0x58, 0x1e, 0x88, 0xd2, 0x9c, 0x2c, 0x2d, 0x6d, 0xdb, 0x13, 0x9b, 0x68, 0x5c, + 0x5b, 0x55, 0xfd, 0x53, 0xe2, 0x27, 0x89, 0x69, 0xcf, 0xea, 0x0b, 0xb0, 0x31, 0x95, 0x01, 0x42, + 0xdf, 0x33, 0x19, 0xfe, 0x9e, 0xea, 0x06, 0x14, 0x23, 0x50, 0xaf, 0x5e, 0x81, 0xcb, 0xb3, 0x50, + 0x5b, 0x1d, 0xfa, 0xf2, 0x08, 0xf2, 0xa2, 0x5b, 0x50, 0xf0, 0x61, 0x5b, 0x9c, 0xd2, 0xd9, 0x31, + 0xf3, 0x0c, 0x34, 0x5f, 0x9d, 0x1d, 0x51, 0xb6, 0xd5, 0xf9, 0x1e, 0x49, 0xf1, 0x97, 0xcf, 0x63, + 0xdb, 0x6e, 0x62, 0x77, 0xa0, 0x7e, 0x04, 0x95, 0x79, 0x70, 0x3c, 0xb5, 0x94, 0x8c, 0xbf, 0x35, + 0xaf, 0x40, 0xee, 0xd4, 0x72, 0x46, 0x98, 0x72, 0x67, 0x45, 0x4d, 0x8e, 0xd8, 0x96, 0x15, 0xd0, + 0x9c, 0xe6, 0x62, 0x31, 0x50, 0x75, 0x78, 0x6a, 0x2e, 0x1c, 0x33, 0x13, 0xc3, 0xec, 0x11, 0x11, + 0xd3, 0xa2, 0x26, 0x06, 0x81, 0x23, 0xf1, 0xb2, 0x62, 0xc0, 0xa6, 0x75, 0x89, 0xc9, 0x76, 0x74, + 0x9a, 0x9f, 0x1f, 0x39, 0x52, 0xff, 0xa2, 0x40, 0x41, 0x23, 0xae, 0xcd, 0xb0, 0x02, 0xdd, 0x05, + 0x85, 0x9c, 0x77, 0x89, 0x20, 0x56, 0xc9, 0x85, 0x64, 0x44, 0x58, 0x34, 0x3c, 0x6d, 0xc6, 0x00, + 0x7c, 0x53, 0xf4, 0x86, 0x24, 0x93, 0x8b, 0x39, 0xa1, 0x74, 0x11, 0x66, 0x93, 0xb7, 0x3d, 0x36, + 0x99, 0x5e, 0x98, 0xf4, 0x85, 0xe5, 0x14, 0x9d, 0x7c, 0x43, 0xd2, 0xc9, 0x4c, 0x8c, 0x49, 0x23, + 0x7c, 0xf2, 0x5e, 0x84, 0x4f, 0x66, 0x63, 0x2c, 0x7b, 0x0e, 0xa1, 0xbc, 0x17, 0x21, 0x94, 0xb9, + 0x18, 0x8e, 0xe6, 0x30, 0xca, 0xdb, 0x1e, 0xa3, 0xcc, 0xc7, 0x08, 0xc3, 0x14, 0xa5, 0xbc, 0x1f, + 0xa5, 0x94, 0x82, 0x0a, 0x3e, 0xb7, 0xd0, 0xc3, 0x5c, 0x4e, 0xb9, 0x17, 0xe2, 0x94, 0xca, 0x42, + 0x22, 0x27, 0x1c, 0xcd, 0x20, 0x95, 0xf7, 0x22, 0xa4, 0x12, 0x62, 0xc4, 0x64, 0x0e, 0xab, 0xbc, + 0x13, 0x66, 0x95, 0x6b, 0x0b, 0xc9, 0xa9, 0xdc, 0x58, 0xb3, 0x68, 0xe5, 0xdb, 0x3e, 0xad, 0x5c, + 0x5f, 0xc8, 0x91, 0xe5, 0x7a, 0xa6, 0x79, 0xe5, 0xf1, 0x05, 0x5e, 0x29, 0x38, 0xe0, 0x8d, 0x85, + 0x6e, 0x96, 0x10, 0xcb, 0xe3, 0x0b, 0xc4, 0xb2, 0x14, 0xc3, 0xe9, 0x12, 0x66, 0xf9, 0xd1, 0x6c, + 0x66, 0xb9, 0x98, 0xf7, 0xc9, 0xd7, 0x8d, 0x47, 0x2d, 0xbb, 0x73, 0xa8, 0x65, 0x99, 0x4f, 0xb1, + 0xbb, 0x70, 0x8a, 0xd5, 0xb9, 0xe5, 0x0b, 0x2c, 0x75, 0x4f, 0x81, 0x0e, 0x83, 0x3a, 0xe2, 0x38, + 0x96, 0x23, 0x69, 0x9b, 0x18, 0xa8, 0xcf, 0x33, 0x32, 0x11, 0x80, 0xcb, 0x02, 0x1e, 0xca, 0xd3, + 0x4a, 0x08, 0x4c, 0xd4, 0xbf, 0x26, 0x03, 0x5b, 0x9e, 0x77, 0xc3, 0x44, 0x44, 0x91, 0x44, 0x24, + 0x44, 0x4f, 0x53, 0x51, 0x7a, 0xba, 0x0d, 0x6b, 0x2c, 0x55, 0x4c, 0x31, 0x4f, 0x6c, 0x7b, 0xcc, + 0x13, 0xdd, 0x80, 0x4d, 0xce, 0x0d, 0x04, 0x89, 0x95, 0xf9, 0x21, 0xc3, 0x53, 0xdd, 0x06, 0xfb, + 0x41, 0x6c, 0x58, 0x91, 0x28, 0x5e, 0x82, 0x4b, 0x21, 0x5d, 0x3f, 0x05, 0x09, 0x9a, 0x55, 0xf6, + 0xb5, 0xf7, 0x64, 0x2e, 0x7a, 0x37, 0x08, 0x50, 0xc0, 0x6a, 0x11, 0x64, 0xba, 0x56, 0x8f, 0xc8, + 0x04, 0xc1, 0x9f, 0x19, 0xd3, 0x1d, 0x5a, 0x7d, 0x99, 0x06, 0xd8, 0x23, 0xd3, 0xf2, 0x91, 0x53, + 0x11, 0xa0, 0xa8, 0xfe, 0x3d, 0x19, 0xf8, 0x0b, 0x88, 0xee, 0x2c, 0x4e, 0x9a, 0xfc, 0xf1, 0x38, + 0x69, 0xea, 0x07, 0x71, 0xd2, 0x70, 0xa2, 0x4e, 0x47, 0x13, 0xf5, 0x77, 0xc9, 0xe0, 0x4b, 0xfb, + 0x0c, 0xf3, 0xfb, 0x45, 0x26, 0xc8, 0xba, 0x59, 0xfe, 0xdd, 0x64, 0xd6, 0x95, 0xf5, 0x43, 0x8e, + 0xcf, 0x1b, 0xad, 0x1f, 0xf2, 0x22, 0x0f, 0xf3, 0x01, 0x7a, 0x0b, 0x14, 0xde, 0x20, 0xd2, 0x2d, + 0xdb, 0x95, 0xe0, 0xbc, 0x3d, 0xbd, 0x5e, 0xd1, 0x03, 0xda, 0x79, 0xc0, 0xf4, 0x8e, 0x6c, 0x57, + 0x2b, 0xd8, 0xf2, 0x29, 0x44, 0x2a, 0x94, 0x08, 0xdf, 0x7d, 0x1a, 0x14, 0xb6, 0x02, 0xd7, 0xc6, + 0x5d, 0xc2, 0x41, 0x56, 0xd1, 0x02, 0x81, 0xda, 0x01, 0x74, 0x11, 0xea, 0xd1, 0x21, 0xe4, 0xc8, + 0x19, 0x31, 0x29, 0xfb, 0x82, 0x69, 0x5e, 0xb6, 0xcc, 0x26, 0x91, 0xc4, 0xa4, 0xb5, 0x0a, 0x0b, + 0xf6, 0x7f, 0xbe, 0xda, 0x2e, 0x0b, 0x8b, 0x17, 0xad, 0x91, 0x41, 0xc9, 0xc8, 0xa6, 0x13, 0x4d, + 0xfa, 0x50, 0xbf, 0x4e, 0x31, 0x36, 0x17, 0x49, 0x03, 0x33, 0x63, 0xec, 0x1d, 0xa8, 0x54, 0x88, + 0xd9, 0xc7, 0x8b, 0xfb, 0x16, 0x40, 0x1f, 0xbb, 0xfa, 0x63, 0x6c, 0x52, 0xd2, 0x93, 0xc1, 0x0f, + 0x49, 0x50, 0x15, 0x0a, 0x6c, 0x34, 0x76, 0x49, 0x4f, 0x16, 0x19, 0xfe, 0x38, 0xb4, 0xd6, 0xfc, + 0x0f, 0x5f, 0x6b, 0x34, 0xda, 0x85, 0xa9, 0x68, 0x87, 0x98, 0x96, 0x12, 0x66, 0x5a, 0xec, 0xfd, + 0x6c, 0xc7, 0xb0, 0x1c, 0x83, 0x4e, 0xf8, 0x27, 0x4a, 0x6b, 0xfe, 0x98, 0xd5, 0xb5, 0x23, 0x32, + 0xb2, 0x2d, 0x6b, 0xa8, 0x0b, 0x40, 0x5b, 0xe3, 0xa6, 0xeb, 0x52, 0xd8, 0xe0, 0xb8, 0xf6, 0xfb, + 0x54, 0x70, 0x24, 0x03, 0x56, 0xfd, 0x3f, 0x19, 0x64, 0xf5, 0x4f, 0xbc, 0x0c, 0x8f, 0x26, 0x7a, + 0xf4, 0x10, 0x36, 0x7d, 0x38, 0xd0, 0xc7, 0x1c, 0x26, 0xbc, 0xcd, 0xbd, 0x0a, 0xa6, 0x94, 0xcf, + 0xa2, 0x62, 0x17, 0xfd, 0x02, 0x9e, 0x9c, 0x82, 0x3d, 0xdf, 0x7d, 0x6a, 0x05, 0xf4, 0x7b, 0x22, + 0x8a, 0x7e, 0x9e, 0xf7, 0x20, 0x6e, 0xe9, 0x1f, 0xe1, 0x20, 0xee, 0xb3, 0x8a, 0x2e, 0x4c, 0x5f, + 0x66, 0xee, 0x86, 0x6b, 0x50, 0x74, 0x08, 0xc5, 0x86, 0xa9, 0x47, 0xea, 0xe7, 0x75, 0x21, 0x94, + 0x55, 0x79, 0x1b, 0x9e, 0x98, 0x49, 0x61, 0xd0, 0x9b, 0xa0, 0x04, 0x0c, 0x28, 0xb9, 0xa0, 0x04, + 0xf5, 0xcb, 0xa9, 0x40, 0x5f, 0xfd, 0x5b, 0x32, 0x70, 0x1b, 0x2d, 0xd2, 0xf6, 0x21, 0xe7, 0x10, + 0x77, 0x3c, 0x14, 0x25, 0x53, 0xe9, 0xe6, 0x2b, 0xf1, 0x09, 0x10, 0x93, 0x8e, 0x87, 0x54, 0x93, + 0x0e, 0xd4, 0x5f, 0x41, 0x4e, 0x48, 0xd0, 0x1a, 0xe4, 0xdf, 0x6f, 0x1d, 0xb4, 0x8e, 0x1e, 0xb6, + 0xca, 0x09, 0x04, 0x90, 0xdb, 0xab, 0xd7, 0x1b, 0x0f, 0xda, 0xe5, 0x24, 0x52, 0x20, 0xbb, 0x57, + 0x3b, 0xd2, 0xda, 0xe5, 0x14, 0x13, 0x6b, 0x8d, 0xfb, 0x8d, 0x7a, 0xbb, 0x9c, 0x46, 0x9b, 0x50, + 0x14, 0xcf, 0xfa, 0xdd, 0x23, 0xed, 0xdd, 0xbd, 0x76, 0x39, 0x13, 0x12, 0x1d, 0x37, 0x5a, 0x77, + 0x1a, 0x5a, 0x39, 0xab, 0xbe, 0xc2, 0xea, 0xb2, 0x39, 0x74, 0x29, 0xa8, 0xc0, 0x92, 0xa1, 0x0a, + 0x4c, 0xfd, 0x73, 0x0a, 0xaa, 0xf3, 0xf9, 0x0f, 0x6a, 0x4d, 0x2d, 0xfe, 0xf5, 0x15, 0x09, 0xd4, + 0x54, 0x04, 0xd0, 0x75, 0x28, 0x39, 0xe4, 0x94, 0xd0, 0xee, 0x40, 0xf0, 0x32, 0x91, 0x5d, 0x8b, + 0x5a, 0x51, 0x4a, 0xb9, 0x91, 0x2b, 0xd4, 0x7e, 0x4d, 0xba, 0x54, 0x17, 0x30, 0x25, 0x36, 0xa1, + 0xc2, 0xd4, 0x98, 0xf4, 0x58, 0x08, 0xd5, 0x8f, 0x56, 0x8a, 0xa7, 0x02, 0x59, 0xad, 0xd1, 0xd6, + 0x3e, 0x28, 0xa7, 0x11, 0x82, 0x12, 0x7f, 0xd4, 0x8f, 0x5b, 0x7b, 0x0f, 0x8e, 0x9b, 0x47, 0x2c, + 0x9e, 0x97, 0x60, 0xc3, 0x8b, 0xa7, 0x27, 0xcc, 0xaa, 0x7f, 0x4c, 0xc1, 0xc6, 0xd4, 0x81, 0x41, + 0xaf, 0x43, 0x56, 0xf0, 0xfd, 0x45, 0xb7, 0x12, 0xfc, 0xec, 0xcb, 0x13, 0x26, 0xd4, 0xd1, 0x3b, + 0x50, 0x20, 0xb2, 0xf9, 0x31, 0xef, 0x80, 0x8a, 0x06, 0x8e, 0xd7, 0x22, 0x91, 0xe6, 0xbe, 0x15, + 0xaa, 0x83, 0xe2, 0xa3, 0x80, 0x2c, 0x46, 0xaf, 0xcf, 0x76, 0xe1, 0x63, 0x88, 0xf4, 0x11, 0xd8, + 0xa1, 0xb7, 0x03, 0xa2, 0x98, 0x99, 0x5d, 0x6d, 0x48, 0x17, 0x42, 0x49, 0x3a, 0xf0, 0x6c, 0xd4, + 0x3a, 0xac, 0x85, 0xd6, 0x86, 0xfe, 0x0f, 0x94, 0x11, 0x3e, 0x97, 0xcd, 0x36, 0xd1, 0x1e, 0x29, + 0x8c, 0xf0, 0xb9, 0xe8, 0xb3, 0x3d, 0x09, 0x79, 0xf6, 0x63, 0x1f, 0x0b, 0x44, 0x4a, 0x6b, 0xb9, + 0x11, 0x3e, 0xbf, 0x87, 0x5d, 0x15, 0x43, 0x29, 0xda, 0x60, 0x62, 0xbb, 0xd3, 0xb1, 0xc6, 0x66, + 0x8f, 0xfb, 0xc8, 0x6a, 0x62, 0x80, 0x6e, 0x41, 0xf6, 0xcc, 0x12, 0x80, 0x36, 0xff, 0x38, 0x9f, + 0x58, 0x94, 0x84, 0x9a, 0x54, 0xc2, 0x42, 0xfd, 0x0d, 0x64, 0x39, 0x38, 0x31, 0xa0, 0xe1, 0xad, + 0x22, 0x49, 0x96, 0xd9, 0x33, 0xc2, 0x00, 0x98, 0x52, 0xc7, 0xe8, 0x8c, 0x03, 0xe7, 0xd7, 0xe6, + 0x03, 0xdc, 0x9e, 0xa7, 0x5b, 0x7b, 0x5a, 0x22, 0xdd, 0xe5, 0xc0, 0x3c, 0x84, 0x76, 0x21, 0xa7, + 0x6a, 0x0b, 0x4a, 0x51, 0xdb, 0x70, 0x33, 0x77, 0x7d, 0x46, 0x33, 0xd7, 0x27, 0x63, 0x3e, 0x95, + 0x4b, 0x8b, 0x36, 0x21, 0x1f, 0xa8, 0x7f, 0x48, 0x42, 0xa1, 0x7d, 0x2e, 0xb7, 0xfb, 0x9c, 0x8e, + 0x54, 0x60, 0x9a, 0x0a, 0xf7, 0x5e, 0x44, 0x8b, 0x2b, 0xed, 0x37, 0xcf, 0xee, 0xf8, 0x87, 0x3a, + 0xb3, 0x4a, 0xe5, 0xeb, 0x75, 0x14, 0x25, 0x98, 0xbd, 0x09, 0x8a, 0xbf, 0xcb, 0x58, 0xf5, 0x81, + 0x7b, 0x3d, 0x87, 0xb8, 0xae, 0x5c, 0x9f, 0x37, 0xe4, 0x4d, 0x4f, 0xeb, 0xb1, 0xec, 0xf0, 0xa4, + 0x35, 0x31, 0x50, 0x07, 0xb0, 0x31, 0x95, 0xe6, 0xd0, 0xcf, 0x21, 0x6f, 0x8f, 0x3b, 0xba, 0x17, + 0xa2, 0x19, 0x07, 0xcb, 0x63, 0xa0, 0xe3, 0xce, 0xd0, 0xe8, 0x1e, 0x90, 0x89, 0xf7, 0x42, 0xf6, + 0xb8, 0x73, 0x20, 0xa2, 0x29, 0x66, 0x4a, 0x85, 0x67, 0xfa, 0x04, 0x0a, 0xde, 0x06, 0x41, 0xb5, + 0xf0, 0xf9, 0x11, 0x93, 0x6c, 0x2d, 0x4e, 0xc1, 0x72, 0x8a, 0xd0, 0xf1, 0xb9, 0x01, 0x9b, 0xae, + 0xd1, 0x37, 0x49, 0x4f, 0x0f, 0xea, 0x20, 0x3e, 0x63, 0x41, 0xdb, 0x10, 0x3f, 0x1c, 0x7a, 0x45, + 0x90, 0xfa, 0xbb, 0x14, 0x14, 0xbc, 0xc3, 0x8c, 0x7e, 0x1a, 0xda, 0x87, 0xa5, 0x39, 0x9d, 0x20, + 0x4f, 0x39, 0xe8, 0x59, 0x46, 0xdf, 0x39, 0xf5, 0xfd, 0xde, 0x79, 0x5e, 0x43, 0xda, 0xbb, 0x21, + 0xc8, 0xac, 0x7c, 0x43, 0xf0, 0x22, 0x20, 0x6a, 0x51, 0x3c, 0xd4, 0xcf, 0x2c, 0x6a, 0x98, 0x7d, + 0x5d, 0x04, 0x5e, 0x30, 0xb3, 0x32, 0xff, 0xe5, 0x84, 0xff, 0xf0, 0x80, 0x7f, 0x83, 0xdf, 0x26, + 0xa1, 0xe0, 0xe7, 0xd3, 0x55, 0x5b, 0x90, 0x57, 0x20, 0x27, 0x53, 0x85, 0xe8, 0x41, 0xca, 0x91, + 0xdf, 0x21, 0xcf, 0x84, 0x3a, 0xe4, 0x55, 0x28, 0x8c, 0x08, 0xc5, 0x9c, 0x58, 0x88, 0x92, 0xd4, + 0x1f, 0xdf, 0xb8, 0x05, 0x6b, 0xa1, 0x8e, 0x30, 0x3b, 0x8d, 0xad, 0xc6, 0xc3, 0x72, 0xa2, 0x9a, + 0xff, 0xf4, 0xf3, 0xab, 0xe9, 0x16, 0x79, 0xcc, 0xf6, 0xb0, 0xd6, 0xa8, 0x37, 0x1b, 0xf5, 0x83, + 0x72, 0xb2, 0xba, 0xf6, 0xe9, 0xe7, 0x57, 0xf3, 0x1a, 0xe1, 0x0d, 0xa3, 0x1b, 0x4d, 0x58, 0x0f, + 0x7f, 0x99, 0x68, 0xb6, 0x41, 0x50, 0xba, 0xf3, 0xfe, 0x83, 0xc3, 0xfd, 0xfa, 0x5e, 0xbb, 0xa1, + 0x9f, 0x1c, 0xb5, 0x1b, 0xe5, 0x24, 0x7a, 0x12, 0x2e, 0x1d, 0xee, 0xdf, 0x6b, 0xb6, 0xf5, 0xfa, + 0xe1, 0x7e, 0xa3, 0xd5, 0xd6, 0xf7, 0xda, 0xed, 0xbd, 0xfa, 0x41, 0x39, 0x75, 0xf3, 0x3b, 0x80, + 0x8d, 0xbd, 0x5a, 0x7d, 0x9f, 0x65, 0x4a, 0xa3, 0x8b, 0x79, 0x39, 0x7c, 0x00, 0x19, 0xde, 0x11, + 0x58, 0x7a, 0xbd, 0x5d, 0x5d, 0xde, 0xb3, 0x44, 0x2d, 0xc8, 0xf2, 0xa6, 0x01, 0x5a, 0x7e, 0xe7, + 0x5d, 0x8d, 0xd1, 0xc8, 0x64, 0x2f, 0xc7, 0x8f, 0xce, 0xd2, 0x8b, 0xf0, 0xea, 0xf2, 0xde, 0x26, + 0xfa, 0x10, 0x94, 0xa0, 0x0b, 0x10, 0xef, 0x72, 0xbc, 0x1a, 0xb3, 0xe7, 0xc9, 0x7c, 0x07, 0xe5, + 0x47, 0xbc, 0x0b, 0xe2, 0x6a, 0x4c, 0xe0, 0x43, 0x6d, 0xc8, 0x7b, 0xd5, 0x63, 0x9c, 0xeb, 0xeb, + 0x6a, 0xac, 0x7e, 0x24, 0xfb, 0x54, 0xa2, 0xea, 0x5f, 0x7e, 0x37, 0x5f, 0x8d, 0xd1, 0x6c, 0x45, + 0xef, 0x41, 0x4e, 0x72, 0xeb, 0x18, 0xd7, 0xd2, 0xd5, 0x38, 0x3d, 0x46, 0x16, 0xd4, 0xa0, 0xcd, + 0x12, 0xef, 0x5f, 0x08, 0xd5, 0x98, 0xbd, 0x65, 0xf4, 0x4b, 0x80, 0x50, 0xdd, 0x1f, 0xf3, 0xef, + 0x05, 0xd5, 0xb8, 0x3d, 0x63, 0xf4, 0x10, 0x0a, 0x7e, 0x09, 0x16, 0xeb, 0xa2, 0xbf, 0x1a, 0xaf, + 0x71, 0x8b, 0x4e, 0xa1, 0x18, 0xad, 0x3b, 0xe2, 0x5f, 0xdf, 0x57, 0x57, 0xe8, 0xc8, 0xb2, 0x79, + 0xa2, 0x85, 0x48, 0xfc, 0x2b, 0xfd, 0xea, 0x0a, 0x4d, 0x5a, 0xe4, 0xc0, 0xe6, 0xc5, 0x62, 0x61, + 0xb5, 0x5b, 0xfe, 0xea, 0x8a, 0xad, 0x5b, 0x34, 0x06, 0x34, 0xa3, 0xd8, 0x58, 0xf1, 0xe2, 0xbf, + 0xba, 0x6a, 0x37, 0xb7, 0x76, 0xff, 0x8b, 0x6f, 0xb6, 0x92, 0x5f, 0x7e, 0xb3, 0x95, 0xfc, 0xfa, + 0x9b, 0xad, 0xe4, 0x67, 0xdf, 0x6e, 0x25, 0xbe, 0xfc, 0x76, 0x2b, 0xf1, 0xaf, 0x6f, 0xb7, 0x12, + 0x1f, 0xbe, 0xdc, 0x37, 0xe8, 0x60, 0xdc, 0x61, 0x0e, 0x77, 0x0f, 0x3e, 0x38, 0x69, 0xb4, 0x08, + 0x7d, 0x6c, 0x39, 0x8f, 0x76, 0xe7, 0xfe, 0x05, 0xab, 0x93, 0xe3, 0x59, 0xf2, 0xd5, 0xff, 0x06, + 0x00, 0x00, 0xff, 0xff, 0x1a, 0x4b, 0x14, 0x0d, 0xa6, 0x25, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3442,7 +3444,7 @@ func NewABCIApplicationClient(cc *grpc.ClientConn) ABCIApplicationClient { func (c *aBCIApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) { out := new(ResponseEcho) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Echo", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/Echo", in, out, opts...) if err != nil { return nil, err } @@ -3451,7 +3453,7 @@ func (c *aBCIApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts func (c *aBCIApplicationClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) { out := new(ResponseFlush) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Flush", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/Flush", in, out, opts...) if err != nil { return nil, err } @@ -3460,7 +3462,7 @@ func (c *aBCIApplicationClient) Flush(ctx context.Context, in *RequestFlush, opt func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) { out := new(ResponseInfo) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Info", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/Info", in, out, opts...) if err != nil { return nil, err } @@ -3469,7 +3471,7 @@ func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts func (c *aBCIApplicationClient) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) { out := new(ResponseSetOption) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/SetOption", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/SetOption", in, out, opts...) if err != nil { return nil, err } @@ -3478,7 +3480,7 @@ func (c *aBCIApplicationClient) SetOption(ctx context.Context, in *RequestSetOpt func (c *aBCIApplicationClient) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) { out := new(ResponseDeliverTx) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/DeliverTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/DeliverTx", in, out, opts...) if err != nil { return nil, err } @@ -3487,7 +3489,7 @@ func (c *aBCIApplicationClient) DeliverTx(ctx context.Context, in *RequestDelive func (c *aBCIApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) { out := new(ResponseCheckTx) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/CheckTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/CheckTx", in, out, opts...) if err != nil { return nil, err } @@ -3496,7 +3498,7 @@ func (c *aBCIApplicationClient) CheckTx(ctx context.Context, in *RequestCheckTx, func (c *aBCIApplicationClient) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) { out := new(ResponseQuery) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Query", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/Query", in, out, opts...) if err != nil { return nil, err } @@ -3505,7 +3507,7 @@ func (c *aBCIApplicationClient) Query(ctx context.Context, in *RequestQuery, opt func (c *aBCIApplicationClient) Commit(ctx context.Context, in *RequestCommit, opts ...grpc.CallOption) (*ResponseCommit, error) { out := new(ResponseCommit) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/Commit", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/Commit", in, out, opts...) if err != nil { return nil, err } @@ -3514,7 +3516,7 @@ func (c *aBCIApplicationClient) Commit(ctx context.Context, in *RequestCommit, o func (c *aBCIApplicationClient) InitChain(ctx context.Context, in *RequestInitChain, opts ...grpc.CallOption) (*ResponseInitChain, error) { out := new(ResponseInitChain) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/InitChain", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/InitChain", in, out, opts...) if err != nil { return nil, err } @@ -3523,7 +3525,7 @@ func (c *aBCIApplicationClient) InitChain(ctx context.Context, in *RequestInitCh func (c *aBCIApplicationClient) BeginBlock(ctx context.Context, in *RequestBeginBlock, opts ...grpc.CallOption) (*ResponseBeginBlock, error) { out := new(ResponseBeginBlock) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/BeginBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/BeginBlock", in, out, opts...) if err != nil { return nil, err } @@ -3532,7 +3534,7 @@ func (c *aBCIApplicationClient) BeginBlock(ctx context.Context, in *RequestBegin func (c *aBCIApplicationClient) EndBlock(ctx context.Context, in *RequestEndBlock, opts ...grpc.CallOption) (*ResponseEndBlock, error) { out := new(ResponseEndBlock) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/EndBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/EndBlock", in, out, opts...) if err != nil { return nil, err } @@ -3541,7 +3543,7 @@ func (c *aBCIApplicationClient) EndBlock(ctx context.Context, in *RequestEndBloc func (c *aBCIApplicationClient) ListSnapshots(ctx context.Context, in *RequestListSnapshots, opts ...grpc.CallOption) (*ResponseListSnapshots, error) { out := new(ResponseListSnapshots) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ListSnapshots", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/ListSnapshots", in, out, opts...) if err != nil { return nil, err } @@ -3550,7 +3552,7 @@ func (c *aBCIApplicationClient) ListSnapshots(ctx context.Context, in *RequestLi func (c *aBCIApplicationClient) OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) { out := new(ResponseOfferSnapshot) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/OfferSnapshot", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/OfferSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -3559,7 +3561,7 @@ func (c *aBCIApplicationClient) OfferSnapshot(ctx context.Context, in *RequestOf func (c *aBCIApplicationClient) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) { out := new(ResponseLoadSnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/LoadSnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/LoadSnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -3568,7 +3570,7 @@ func (c *aBCIApplicationClient) LoadSnapshotChunk(ctx context.Context, in *Reque func (c *aBCIApplicationClient) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) { out := new(ResponseApplySnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCIApplication/ApplySnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v034x.abci.ABCIApplication/ApplySnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -3658,7 +3660,7 @@ func _ABCIApplication_Echo_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/Echo", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Echo(ctx, req.(*RequestEcho)) @@ -3676,7 +3678,7 @@ func _ABCIApplication_Flush_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/Flush", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/Flush", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Flush(ctx, req.(*RequestFlush)) @@ -3694,7 +3696,7 @@ func _ABCIApplication_Info_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/Info", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/Info", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Info(ctx, req.(*RequestInfo)) @@ -3712,7 +3714,7 @@ func _ABCIApplication_SetOption_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/SetOption", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/SetOption", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).SetOption(ctx, req.(*RequestSetOption)) @@ -3730,7 +3732,7 @@ func _ABCIApplication_DeliverTx_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/DeliverTx", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/DeliverTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).DeliverTx(ctx, req.(*RequestDeliverTx)) @@ -3748,7 +3750,7 @@ func _ABCIApplication_CheckTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/CheckTx", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/CheckTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).CheckTx(ctx, req.(*RequestCheckTx)) @@ -3766,7 +3768,7 @@ func _ABCIApplication_Query_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/Query", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/Query", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Query(ctx, req.(*RequestQuery)) @@ -3784,7 +3786,7 @@ func _ABCIApplication_Commit_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/Commit", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/Commit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).Commit(ctx, req.(*RequestCommit)) @@ -3802,7 +3804,7 @@ func _ABCIApplication_InitChain_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/InitChain", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/InitChain", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).InitChain(ctx, req.(*RequestInitChain)) @@ -3820,7 +3822,7 @@ func _ABCIApplication_BeginBlock_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/BeginBlock", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/BeginBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).BeginBlock(ctx, req.(*RequestBeginBlock)) @@ -3838,7 +3840,7 @@ func _ABCIApplication_EndBlock_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/EndBlock", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/EndBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).EndBlock(ctx, req.(*RequestEndBlock)) @@ -3856,7 +3858,7 @@ func _ABCIApplication_ListSnapshots_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/ListSnapshots", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/ListSnapshots", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).ListSnapshots(ctx, req.(*RequestListSnapshots)) @@ -3874,7 +3876,7 @@ func _ABCIApplication_OfferSnapshot_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/OfferSnapshot", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/OfferSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).OfferSnapshot(ctx, req.(*RequestOfferSnapshot)) @@ -3892,7 +3894,7 @@ func _ABCIApplication_LoadSnapshotChunk_Handler(srv interface{}, ctx context.Con } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/LoadSnapshotChunk", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/LoadSnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).LoadSnapshotChunk(ctx, req.(*RequestLoadSnapshotChunk)) @@ -3910,7 +3912,7 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCIApplication/ApplySnapshotChunk", + FullMethod: "/cometbft.v034x.abci.ABCIApplication/ApplySnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIApplicationServer).ApplySnapshotChunk(ctx, req.(*RequestApplySnapshotChunk)) @@ -3919,7 +3921,7 @@ func _ABCIApplication_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Co } var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.abci.ABCIApplication", + ServiceName: "cometbft.v034x.abci.ABCIApplication", HandlerType: (*ABCIApplicationServer)(nil), Methods: []grpc.MethodDesc{ { @@ -3984,7 +3986,7 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/abci/types.proto", + Metadata: "cometbft/v034x/abci/types.proto", } func (m *Request) Marshal() (dAtA []byte, err error) { diff --git a/abci/version/version.go b/abci/version/version.go index 2314c2852ac..0cd998bf9a6 100644 --- a/abci/version/version.go +++ b/abci/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/version" ) // TODO: eliminate this after some version refactor diff --git a/behaviour/peer_behaviour.go b/behaviour/peer_behaviour.go index f7cfd00f032..11104ba4dab 100644 --- a/behaviour/peer_behaviour.go +++ b/behaviour/peer_behaviour.go @@ -1,7 +1,7 @@ package behaviour import ( - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // PeerBehaviour is a struct describing a behaviour a peer performed. diff --git a/behaviour/reporter.go b/behaviour/reporter.go index 60cca568cd7..7224efda81b 100644 --- a/behaviour/reporter.go +++ b/behaviour/reporter.go @@ -3,8 +3,8 @@ package behaviour import ( "errors" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // Reporter provides an interface for reactors to report the behaviour diff --git a/behaviour/reporter_test.go b/behaviour/reporter_test.go index 330505bd238..a3e5ca35abe 100644 --- a/behaviour/reporter_test.go +++ b/behaviour/reporter_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - bh "github.com/tendermint/tendermint/behaviour" - "github.com/tendermint/tendermint/p2p" + bh "github.com/KYVENetwork/cometbft/v034x/behaviour" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // TestMockReporter tests the MockReporter's ability to store reported diff --git a/blockchain/msgs.go b/blockchain/msgs.go index 9b45e859c58..7d89899c39b 100644 --- a/blockchain/msgs.go +++ b/blockchain/msgs.go @@ -6,9 +6,9 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/blockchain/msgs_test.go b/blockchain/msgs_test.go index 760d419d768..4c453cb3296 100644 --- a/blockchain/msgs_test.go +++ b/blockchain/msgs_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/types" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestBcBlockRequestMessageValidateBasic(t *testing.T) { diff --git a/blockchain/v0/pool.go b/blockchain/v0/pool.go index b3a09b1dc33..e8d73986f89 100644 --- a/blockchain/v0/pool.go +++ b/blockchain/v0/pool.go @@ -7,12 +7,12 @@ import ( "sync/atomic" "time" - flow "github.com/tendermint/tendermint/libs/flowrate" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + flow "github.com/KYVENetwork/cometbft/v034x/libs/flowrate" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) /* diff --git a/blockchain/v0/pool_test.go b/blockchain/v0/pool_test.go index 2fac70e892e..974081ae057 100644 --- a/blockchain/v0/pool_test.go +++ b/blockchain/v0/pool_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) func init() { @@ -45,7 +45,7 @@ func (p testPeer) simulateInput(input inputData) { input.pool.AddBlock(input.request.PeerID, block, 123) // TODO: uncommenting this creates a race which is detected by: // https://github.com/golang/go/blob/2bd767b1022dd3254bcec469f0ee164024726486/src/testing/testing.go#L854-L856 - // see: https://github.com/tendermint/tendermint/issues/3390#issue-418379890 + // see: https://github.com/KYVENetwork/cometbft/v034x/issues/3390#issue-418379890 // input.t.Logf("Added block from peer %v (height: %v)", input.request.PeerID, input.request.Height) } diff --git a/blockchain/v0/reactor.go b/blockchain/v0/reactor.go index 0ac278041dd..3ac203c34b6 100644 --- a/blockchain/v0/reactor.go +++ b/blockchain/v0/reactor.go @@ -7,13 +7,13 @@ import ( "github.com/gogo/protobuf/proto" - bc "github.com/tendermint/tendermint/blockchain" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + bc "github.com/KYVENetwork/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/blockchain/v0/reactor_test.go b/blockchain/v0/reactor_test.go index 0bb02b44004..ec5e3026b4c 100644 --- a/blockchain/v0/reactor_test.go +++ b/blockchain/v0/reactor_test.go @@ -13,17 +13,17 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mempool/mock" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/mempool/mock" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var config *cfg.Config diff --git a/blockchain/v1/peer.go b/blockchain/v1/peer.go index ad26585b306..709897fd75a 100644 --- a/blockchain/v1/peer.go +++ b/blockchain/v1/peer.go @@ -5,10 +5,10 @@ import ( "math" "time" - flow "github.com/tendermint/tendermint/libs/flowrate" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + flow "github.com/KYVENetwork/cometbft/v034x/libs/flowrate" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) //-------- diff --git a/blockchain/v1/peer_test.go b/blockchain/v1/peer_test.go index 1798f13b56d..833bcd8b5b9 100644 --- a/blockchain/v1/peer_test.go +++ b/blockchain/v1/peer_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestPeerMonitor(t *testing.T) { diff --git a/blockchain/v1/pool.go b/blockchain/v1/pool.go index 27e0f3a04e1..989395e6a4e 100644 --- a/blockchain/v1/pool.go +++ b/blockchain/v1/pool.go @@ -3,9 +3,9 @@ package v1 import ( "sort" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) // BlockPool keeps track of the fast sync peers, block requests and block responses. diff --git a/blockchain/v1/pool_test.go b/blockchain/v1/pool_test.go index 31b9d09f7dc..978527f5938 100644 --- a/blockchain/v1/pool_test.go +++ b/blockchain/v1/pool_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) type testPeer struct { diff --git a/blockchain/v1/reactor.go b/blockchain/v1/reactor.go index f6fb93ab8de..10a98652d90 100644 --- a/blockchain/v1/reactor.go +++ b/blockchain/v1/reactor.go @@ -6,14 +6,14 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/behaviour" - bc "github.com/tendermint/tendermint/blockchain" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/behaviour" + bc "github.com/KYVENetwork/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/blockchain/v1/reactor_fsm.go b/blockchain/v1/reactor_fsm.go index 2571dff6a86..2ff7bbdc9ac 100644 --- a/blockchain/v1/reactor_fsm.go +++ b/blockchain/v1/reactor_fsm.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Blockchain Reactor State diff --git a/blockchain/v1/reactor_fsm_test.go b/blockchain/v1/reactor_fsm_test.go index fad40b0052b..7fe15a9f5e8 100644 --- a/blockchain/v1/reactor_fsm_test.go +++ b/blockchain/v1/reactor_fsm_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) type lastBlockRequestT struct { diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go index 1e04225cd77..85738a06b8e 100644 --- a/blockchain/v1/reactor_test.go +++ b/blockchain/v1/reactor_test.go @@ -14,18 +14,18 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mempool/mock" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/mempool/mock" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var config *cfg.Config diff --git a/blockchain/v2/io.go b/blockchain/v2/io.go index af9f037fe66..565442120d7 100644 --- a/blockchain/v2/io.go +++ b/blockchain/v2/io.go @@ -3,10 +3,10 @@ package v2 import ( "fmt" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) type iIO interface { diff --git a/blockchain/v2/processor.go b/blockchain/v2/processor.go index 8b7401e7dbd..bc777c90bcb 100644 --- a/blockchain/v2/processor.go +++ b/blockchain/v2/processor.go @@ -3,9 +3,9 @@ package v2 import ( "fmt" - "github.com/tendermint/tendermint/p2p" - cmtState "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtState "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Events generated by the processor: diff --git a/blockchain/v2/processor_context.go b/blockchain/v2/processor_context.go index fed488d09fb..684a1f33dfe 100644 --- a/blockchain/v2/processor_context.go +++ b/blockchain/v2/processor_context.go @@ -3,8 +3,8 @@ package v2 import ( "fmt" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) type processorContext interface { diff --git a/blockchain/v2/processor_test.go b/blockchain/v2/processor_test.go index 2c98c045065..04f37a64953 100644 --- a/blockchain/v2/processor_test.go +++ b/blockchain/v2/processor_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/p2p" - cmtState "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtState "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) // pcBlock is a test helper structure with simple types. Its purpose is to help with test readability. diff --git a/blockchain/v2/reactor.go b/blockchain/v2/reactor.go index a381572c51d..bd673716bf6 100644 --- a/blockchain/v2/reactor.go +++ b/blockchain/v2/reactor.go @@ -7,14 +7,14 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/behaviour" - bc "github.com/tendermint/tendermint/blockchain" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/behaviour" + bc "github.com/KYVENetwork/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/blockchain/v2/reactor_test.go b/blockchain/v2/reactor_test.go index 5c6ad8a91a6..6a275faad13 100644 --- a/blockchain/v2/reactor_test.go +++ b/blockchain/v2/reactor_test.go @@ -14,20 +14,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/behaviour" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/mempool/mock" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/conn" - bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/behaviour" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/mempool/mock" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + bcproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) type mockPeer struct { @@ -160,7 +160,7 @@ func newTestReactor(p testReactorParams) *BlockchainReactor { } // This test is left here and not deleted to retain the termination cases for -// future improvement in [#4482](https://github.com/tendermint/tendermint/issues/4482). +// future improvement in [#4482](https://github.com/KYVENetwork/cometbft/v034x/issues/4482). // func TestReactorTerminationScenarios(t *testing.T) { // config := cfg.ResetTestRoot("blockchain_reactor_v2_test") diff --git a/blockchain/v2/routine.go b/blockchain/v2/routine.go index 119ca22e2db..757ef608846 100644 --- a/blockchain/v2/routine.go +++ b/blockchain/v2/routine.go @@ -7,7 +7,7 @@ import ( "github.com/Workiva/go-datastructures/queue" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) type handleFunc = func(event Event) (Event, error) diff --git a/blockchain/v2/scheduler.go b/blockchain/v2/scheduler.go index 35166764fe1..f64d47cb0a9 100644 --- a/blockchain/v2/scheduler.go +++ b/blockchain/v2/scheduler.go @@ -8,8 +8,8 @@ import ( "sort" "time" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Events generated by the scheduler: diff --git a/blockchain/v2/scheduler_test.go b/blockchain/v2/scheduler_test.go index bed01bafc60..708146f0258 100644 --- a/blockchain/v2/scheduler_test.go +++ b/blockchain/v2/scheduler_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) type scTestParams struct { diff --git a/cmd/cometbft/commands/compact.go b/cmd/cometbft/commands/compact.go index 6febd9a1dca..a7c506d35a8 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/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 3106355d50d..d8f98b192d9 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) var ( diff --git a/cmd/cometbft/commands/debug/dump.go b/cmd/cometbft/commands/debug/dump.go index 22093056ec5..04d49ad4034 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" ) var dumpCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/kill.go b/cmd/cometbft/commands/debug/kill.go index 8964bb9a133..37cd3f4b8dc 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" ) var killCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/util.go b/cmd/cometbft/commands/debug/util.go index d471eb95928..da70b49b7dd 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/tendermint/tendermint/config" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + rpchttp "github.com/KYVENetwork/cometbft/v034x/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 41842be1133..0d233ccfec1 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/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/p2p" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/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 e9266c885d9..5e0e834a76d 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/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/privval" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/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 6b840f1869a..768393c8951 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/tendermint/tendermint/config" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) // InitFilesCmd initialises a fresh CometBFT Core instance. diff --git a/cmd/cometbft/commands/light.go b/cmd/cometbft/commands/light.go index 16d82130df1..ebdec628691 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/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/light" - lproxy "github.com/tendermint/tendermint/light/proxy" - lrpc "github.com/tendermint/tendermint/light/rpc" - dbs "github.com/tendermint/tendermint/light/store/db" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/light" + lproxy "github.com/KYVENetwork/cometbft/v034x/light/proxy" + lrpc "github.com/KYVENetwork/cometbft/v034x/light/rpc" + dbs "github.com/KYVENetwork/cometbft/v034x/light/store/db" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" ) // LightCmd represents the base command when called without any subcommands @@ -207,7 +207,7 @@ func runProxy(cmd *cobra.Command, args []string) error { cfg.MaxOpenConnections = maxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if cfg.WriteTimeout <= config.RPC.TimeoutBroadcastTxCommit { cfg.WriteTimeout = config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } diff --git a/cmd/cometbft/commands/probe_upnp.go b/cmd/cometbft/commands/probe_upnp.go index 6d0f6d582f9..0b75d9b7605 100644 --- a/cmd/cometbft/commands/probe_upnp.go +++ b/cmd/cometbft/commands/probe_upnp.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/p2p/upnp" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/p2p/upnp" ) // ProbeUpnpCmd adds capabilities to test the UPnP functionality. diff --git a/cmd/cometbft/commands/reindex_event.go b/cmd/cometbft/commands/reindex_event.go index 5162a62d88a..0b497d90bad 100644 --- a/cmd/cometbft/commands/reindex_event.go +++ b/cmd/cometbft/commands/reindex_event.go @@ -8,16 +8,16 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/spf13/cobra" - abcitypes "github.com/tendermint/tendermint/abci/types" - cmtcfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/progressbar" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" - "github.com/tendermint/tendermint/state/indexer/sink/psql" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/state/txindex/kv" - "github.com/tendermint/tendermint/types" + abcitypes "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtcfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/progressbar" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + blockidxkv "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v034x/state/indexer/sink/psql" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( @@ -37,8 +37,8 @@ var ReIndexEventCmd = &cobra.Command{ 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 +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 57a9d180908..ec6219f67d5 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/tendermint/tendermint/abci/types" - cmtcfg "github.com/tendermint/tendermint/config" - protocmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - blockmocks "github.com/tendermint/tendermint/state/indexer/mocks" - "github.com/tendermint/tendermint/state/mocks" - txmocks "github.com/tendermint/tendermint/state/txindex/mocks" - "github.com/tendermint/tendermint/types" + abcitypes "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtcfg "github.com/KYVENetwork/cometbft/v034x/config" + protocmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + blockmocks "github.com/KYVENetwork/cometbft/v034x/state/indexer/mocks" + "github.com/KYVENetwork/cometbft/v034x/state/mocks" + txmocks "github.com/KYVENetwork/cometbft/v034x/state/txindex/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/cmd/cometbft/commands/replay.go b/cmd/cometbft/commands/replay.go index 28b6f0218f1..9daded5edc8 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/tendermint/tendermint/consensus" + "github.com/KYVENetwork/cometbft/v034x/consensus" ) // ReplayCmd allows replaying of messages from the WAL. diff --git a/cmd/cometbft/commands/reset.go b/cmd/cometbft/commands/reset.go index 0f1e5bbe214..06e521b03cc 100644 --- a/cmd/cometbft/commands/reset.go +++ b/cmd/cometbft/commands/reset.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/privval" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/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 3ee4be6354b..105b6d9d273 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/privval" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/privval" ) func Test_ResetAll(t *testing.T) { diff --git a/cmd/cometbft/commands/rollback.go b/cmd/cometbft/commands/rollback.go index 3f705c34057..f5877422136 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" ) var RollbackStateCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/root.go b/cmd/cometbft/commands/root.go index 45dc9342384..f2dce64a3de 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - cmtflags "github.com/tendermint/tendermint/libs/cli/flags" - "github.com/tendermint/tendermint/libs/log" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + cmtflags "github.com/KYVENetwork/cometbft/v034x/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) var ( diff --git a/cmd/cometbft/commands/root_test.go b/cmd/cometbft/commands/root_test.go index 4c22b56516f..4c1faf653b3 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - cmtos "github.com/tendermint/tendermint/libs/os" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + cmtos "github.com/KYVENetwork/cometbft/v034x/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 acfc6f15b44..2e2001a02cc 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/tendermint/tendermint/config" - cmtos "github.com/tendermint/tendermint/libs/os" - nm "github.com/tendermint/tendermint/node" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + nm "github.com/KYVENetwork/cometbft/v034x/node" ) var ( diff --git a/cmd/cometbft/commands/show_node_id.go b/cmd/cometbft/commands/show_node_id.go index a5d8a7f4f28..d396f2cbc29 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/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/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 51dd8cc8604..9ca2bb92a0f 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/tendermint/tendermint/libs/json" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/privval" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/privval" ) // ShowValidatorCmd adds capabilities for showing the validator info. diff --git a/cmd/cometbft/commands/testnet.go b/cmd/cometbft/commands/testnet.go index 357d5502fe5..9c077b77e23 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/bytes" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var ( diff --git a/cmd/cometbft/commands/version.go b/cmd/cometbft/commands/version.go index 40014b13763..1bf87ca699c 100644 --- a/cmd/cometbft/commands/version.go +++ b/cmd/cometbft/commands/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/version" ) // VersionCmd ... diff --git a/cmd/cometbft/main.go b/cmd/cometbft/main.go index 7ae91383116..9f822eb74f5 100644 --- a/cmd/cometbft/main.go +++ b/cmd/cometbft/main.go @@ -4,11 +4,11 @@ import ( "os" "path/filepath" - cmd "github.com/tendermint/tendermint/cmd/cometbft/commands" - "github.com/tendermint/tendermint/cmd/cometbft/commands/debug" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - nm "github.com/tendermint/tendermint/node" + cmd "github.com/KYVENetwork/cometbft/v034x/cmd/cometbft/commands" + "github.com/KYVENetwork/cometbft/v034x/cmd/cometbft/commands/debug" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + nm "github.com/KYVENetwork/cometbft/v034x/node" ) func main() { diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go index 1c7183852ac..95ee99c78c0 100644 --- a/cmd/priv_val_server/main.go +++ b/cmd/priv_val_server/main.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - cmtos "github.com/tendermint/tendermint/libs/os" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" - "github.com/tendermint/tendermint/privval" + "github.com/KYVENetwork/cometbft/v034x/privval" ) func main() { diff --git a/config/config.go b/config/config.go index daaf04366b6..7e22e87ee8f 100644 --- a/config/config.go +++ b/config/config.go @@ -379,7 +379,7 @@ type RPCConfig struct { // How long to wait for a tx to be committed during /broadcast_tx_commit // WARNING: Using a value larger than 10s will result in increasing the // global HTTP write timeout, which applies to all connections and endpoints. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 TimeoutBroadcastTxCommit time.Duration `mapstructure:"timeout_broadcast_tx_commit"` // Maximum size of request body, in bytes @@ -726,7 +726,7 @@ type MempoolConfig struct { MaxTxBytes int `mapstructure:"max_tx_bytes"` // Maximum size of a batch of transactions to send to a peer // Including space needed by encoding (one varint per transaction). - // XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 + // XXX: Unused due to https://github.com/KYVENetwork/cometbft/v034x/issues/5796 MaxBatchBytes int `mapstructure:"max_batch_bytes"` // Experimental parameters to limit gossiping txs to up to the specified number of peers. // This feature is only available for the default mempool (version config set to "v0"). diff --git a/config/toml.go b/config/toml.go index 7c6d5602ae0..84f85237c5d 100644 --- a/config/toml.go +++ b/config/toml.go @@ -8,7 +8,7 @@ import ( "strings" "text/template" - cmtos "github.com/tendermint/tendermint/libs/os" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" ) // DefaultDirPerm is the default permissions used when creating directories. @@ -236,7 +236,7 @@ experimental_close_on_slow_client = {{ .RPC.CloseOnSlowClient }} # How long to wait for a tx to be committed during /broadcast_tx_commit. # WARNING: Using a value larger than 10s will result in increasing the # global HTTP write timeout, which applies to all connections and endpoints. -# See https://github.com/tendermint/tendermint/issues/3435 +# See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 timeout_broadcast_tx_commit = "{{ .RPC.TimeoutBroadcastTxCommit }}" # Maximum size of request body, in bytes @@ -378,7 +378,7 @@ max_tx_bytes = {{ .Mempool.MaxTxBytes }} # Maximum size of a batch of transactions to send to a peer # Including space needed by encoding (one varint per transaction). -# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 +# XXX: Unused due to https://github.com/KYVENetwork/cometbft/v034x/issues/5796 max_batch_bytes = {{ .Mempool.MaxBatchBytes }} # ttl-duration, if non-zero, defines the maximum amount of time a transaction @@ -627,7 +627,7 @@ var testGenesisFmt = `{ "validators": [ { "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/PubKeyEd25519", "value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE=" }, "power": "10", @@ -640,11 +640,11 @@ var testGenesisFmt = `{ var testPrivValidatorKey = `{ "address": "A3258DCBF45DCA0DF052981870F2D1441A36D145", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/PubKeyEd25519", "value": "AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE=" }, "priv_key": { - "type": "tendermint/PrivKeyEd25519", + "type": "cometbft/PrivKeyEd25519", "value": "EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ==" } }` diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 53d26244401..1c6de5aac1a 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -14,23 +14,23 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/tendermint/tendermint/abci/client" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/evidence" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - mempl "github.com/tendermint/tendermint/mempool" - - cfg "github.com/tendermint/tendermint/config" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/evidence" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + + cfg "github.com/KYVENetwork/cometbft/v034x/config" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) //---------------------------------------------- diff --git a/consensus/common_test.go b/consensus/common_test.go index ddf487cddca..109c2337445 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -17,27 +17,27 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/counter" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - cstypes "github.com/tendermint/tendermint/consensus/types" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtsync "github.com/tendermint/tendermint/libs/sync" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/counter" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const ( diff --git a/consensus/invalid_test.go b/consensus/invalid_test.go index 6f8e7f380af..656d1b964e5 100644 --- a/consensus/invalid_test.go +++ b/consensus/invalid_test.go @@ -3,13 +3,13 @@ package consensus import ( "testing" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) //---------------------------------------------- diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 678091bcf8b..bf2d1c1d206 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -12,11 +12,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/code" - abci "github.com/tendermint/tendermint/abci/types" - mempl "github.com/tendermint/tendermint/mempool" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) // for testing diff --git a/consensus/metrics.go b/consensus/metrics.go index dcaaae9399f..d68bbc20ae7 100644 --- a/consensus/metrics.go +++ b/consensus/metrics.go @@ -4,9 +4,9 @@ import ( "strings" "time" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" "github.com/go-kit/kit/metrics" "github.com/go-kit/kit/metrics/discard" - cstypes "github.com/tendermint/tendermint/consensus/types" prometheus "github.com/go-kit/kit/metrics/prometheus" stdprometheus "github.com/prometheus/client_golang/prometheus" diff --git a/consensus/msgs.go b/consensus/msgs.go index 2675206c3fd..36b1b20a89a 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -4,14 +4,14 @@ import ( "errors" "fmt" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" "github.com/gogo/protobuf/proto" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/libs/bits" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/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 89825da5ee9..2d4cefff4dd 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/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/libs/bits" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestMsgToProto(t *testing.T) { diff --git a/consensus/reactor.go b/consensus/reactor.go index 7dda1c73da4..9045bc6dbc2 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -7,19 +7,19 @@ import ( "sync" "time" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtevents "github.com/KYVENetwork/cometbft/v034x/libs/events" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" "github.com/gogo/protobuf/proto" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/libs/bits" - cmtevents "github.com/tendermint/tendermint/libs/events" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" ) const ( @@ -1518,15 +1518,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/NewRoundStepMessage") + cmtjson.RegisterType(&NewValidBlockMessage{}, "cometbft/NewValidBlockMessage") + cmtjson.RegisterType(&ProposalMessage{}, "cometbft/Proposal") + cmtjson.RegisterType(&ProposalPOLMessage{}, "cometbft/ProposalPOL") + cmtjson.RegisterType(&BlockPartMessage{}, "cometbft/BlockPart") + cmtjson.RegisterType(&VoteMessage{}, "cometbft/Vote") + cmtjson.RegisterType(&HasVoteMessage{}, "cometbft/HasVote") + cmtjson.RegisterType(&VoteSetMaj23Message{}, "cometbft/VoteSetMaj23") + cmtjson.RegisterType(&VoteSetBitsMessage{}, "cometbft/VoteSetBits") } //------------------------------------- diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index d5dae78dc02..ee9df554fc3 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -19,28 +19,28 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - cstypes "github.com/tendermint/tendermint/consensus/types" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/bits" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - p2pmock "github.com/tendermint/tendermint/p2p/mock" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - statemocks "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + p2pmock "github.com/KYVENetwork/cometbft/v034x/p2p/mock" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + statemocks "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) //---------------------------------------------- diff --git a/consensus/replay.go b/consensus/replay.go index 7c6d55e1b8f..b8621f94807 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -9,12 +9,12 @@ import ( "reflect" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) var crc32c = crc32.MakeTable(crc32.Castagnoli) diff --git a/consensus/replay_file.go b/consensus/replay_file.go index 03096fd74ec..c9f7c646bba 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go index a53ef49e89c..39a99c8c6df 100644 --- a/consensus/replay_stubs.go +++ b/consensus/replay_stubs.go @@ -1,12 +1,12 @@ package consensus import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/clist" - mempl "github.com/tendermint/tendermint/mempool" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/replay_test.go b/consensus/replay_test.go index 30fdc38f7ad..0e84047595a 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -17,20 +17,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/privval" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/privval" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestMain(m *testing.M) { diff --git a/consensus/state.go b/consensus/state.go index 4efdf42316c..5911fdc31c6 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -12,22 +12,22 @@ import ( "github.com/gogo/protobuf/proto" - cfg "github.com/tendermint/tendermint/config" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/crypto" - cmtevents "github.com/tendermint/tendermint/libs/events" - "github.com/tendermint/tendermint/libs/fail" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtevents "github.com/KYVENetwork/cometbft/v034x/libs/events" + "github.com/KYVENetwork/cometbft/v034x/libs/fail" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) // Consensus sentinel errors @@ -869,7 +869,7 @@ func (cs *State) handleMsg(mi msgInfo) { // We probably don't want to stop the peer here. The vote does not // necessarily comes from a malicious peer but can be just broadcasted by // a typical peer. - // https://github.com/tendermint/tendermint/issues/1281 + // https://github.com/KYVENetwork/cometbft/v034x/issues/1281 // } // NOTE: the vote is broadcast to peers by the reactor listening @@ -2014,7 +2014,7 @@ func (cs *State) tryAddVote(vote *types.Vote, peerID p2p.ID) (bool, error) { // 1) bad peer OR // 2) not a bad peer? this can also err sometimes with "Unexpected step" OR // 3) tmkms use with multiple validators connecting to a single tmkms instance - // (https://github.com/tendermint/tendermint/issues/3839). + // (https://github.com/KYVENetwork/cometbft/v034x/issues/3839). cs.Logger.Info("failed attempting to add vote", "err", err) return added, ErrAddingVote } @@ -2238,11 +2238,11 @@ func (cs *State) voteTime() time.Time { now := cmttime.Now() minVoteTime := now // 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/tendermint/tendermint/tree/v0.34.x/spec/. + // even if cs.LockedBlock != nil. See https://github.com/KYVENetwork/cometbft/v034x/tree/v0.34.x/spec/. timeIota := time.Duration(cs.state.ConsensusParams.Block.TimeIotaMs) * time.Millisecond if cs.LockedBlock != nil { // See the BFT time spec - // https://github.com/tendermint/tendermint/blob/v0.34.x/spec/consensus/bft-time.md + // https://github.com/KYVENetwork/cometbft/v034x/blob/v0.34.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 016869ed249..47b456ab4e5 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -11,15 +11,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/counter" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtrand "github.com/tendermint/tendermint/libs/rand" - p2pmock "github.com/tendermint/tendermint/p2p/mock" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/counter" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + p2pmock "github.com/KYVENetwork/cometbft/v034x/p2p/mock" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) /* diff --git a/consensus/ticker.go b/consensus/ticker.go index fb3571ac867..eb1a8ea096e 100644 --- a/consensus/ticker.go +++ b/consensus/ticker.go @@ -3,8 +3,8 @@ package consensus import ( "time" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) var ( diff --git a/consensus/types/height_vote_set.go b/consensus/types/height_vote_set.go index 7bf05433aae..80782323aca 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/tendermint/tendermint/libs/json" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/p2p" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) type RoundVoteSet struct { diff --git a/consensus/types/height_vote_set_test.go b/consensus/types/height_vote_set_test.go index a969a8f8645..03265785951 100644 --- a/consensus/types/height_vote_set_test.go +++ b/consensus/types/height_vote_set_test.go @@ -5,12 +5,12 @@ import ( "os" "testing" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var config *cfg.Config // NOTE: must be reset for each _test.go file diff --git a/consensus/types/peer_round_state.go b/consensus/types/peer_round_state.go index 07283c5b4de..374e4fdbf72 100644 --- a/consensus/types/peer_round_state.go +++ b/consensus/types/peer_round_state.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/bits" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/types/round_state.go b/consensus/types/round_state.go index 9e67b76c074..8e1ea71162b 100644 --- a/consensus/types/round_state.go +++ b/consensus/types/round_state.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/wal.go b/consensus/wal.go index 90c7e208cd6..ba8cf0b784e 100644 --- a/consensus/wal.go +++ b/consensus/wal.go @@ -11,13 +11,13 @@ import ( "github.com/gogo/protobuf/proto" - auto "github.com/tendermint/tendermint/libs/autofile" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/service" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmttime "github.com/tendermint/tendermint/types/time" + auto "github.com/KYVENetwork/cometbft/v034x/libs/autofile" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmttime "github.com/KYVENetwork/cometbft/v034x/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/wal/MsgInfo") + cmtjson.RegisterType(timeoutInfo{}, "cometbft/wal/TimeoutInfo") + cmtjson.RegisterType(EndHeightMessage{}, "cometbft/wal/EndHeightMessage") } //-------------------------------------------------------- diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go index f49cedf9492..f63ceb6f5bf 100644 --- a/consensus/wal_generator.go +++ b/consensus/wal_generator.go @@ -11,15 +11,15 @@ import ( db "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/kvstore" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/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 eb8840b19fd..aa524d50901 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/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/libs/autofile" - "github.com/tendermint/tendermint/libs/log" - cmttypes "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/libs/autofile" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmttypes "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const ( diff --git a/crypto/README.md b/crypto/README.md index 576e3d81142..31e36bee32f 100644 --- a/crypto/README.md +++ b/crypto/README.md @@ -21,10 +21,10 @@ JSON encoding is done using CometBFT's internal json encoder. For more informati ```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/PrivKeyEd25519","value":"EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ=="} +ed25519.PubKey - {"type":"cometbft/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="} +sr25519.PrivKeySr25519 - {"type":"cometbft/PrivKeySr25519","value":"xtYVH8UCIqfrY8FIFc0QEpAEBShSG4NT0zlEOVSZ2w4="} +sr25519.PubKeySr25519 - {"type":"cometbft/PubKeySr25519","value":"8sKBLKQ/OoXMcAJVxBqz1U7TyxRFQ5cmliuHy4MrF0s="} +crypto.PrivKeySecp256k1 - {"type":"cometbft/PrivKeySecp256k1","value":"zx4Pnh67N+g2V+5vZbQzEyRerX9c4ccNZOVzM9RvJ0Y="} +crypto.PubKeySecp256k1 - {"type":"cometbft/PubKeySecp256k1","value":"A8lPKJXcNl5VHt1FK8a244K9EJuS4WX1hFBnwisi0IJx"} ``` diff --git a/crypto/crypto.go b/crypto/crypto.go index 9a341f9ac53..e6598e944e7 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -1,8 +1,8 @@ package crypto import ( - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" ) const ( diff --git a/crypto/ed25519/bench_test.go b/crypto/ed25519/bench_test.go index 47897cde6ba..e481ebabdba 100644 --- a/crypto/ed25519/bench_test.go +++ b/crypto/ed25519/bench_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/internal/benchmarking" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go index d9db8adbfa0..1839df36b13 100644 --- a/crypto/ed25519/ed25519.go +++ b/crypto/ed25519/ed25519.go @@ -8,9 +8,9 @@ import ( "golang.org/x/crypto/ed25519" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtjson "github.com/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" ) //------------------------------------- @@ -18,8 +18,8 @@ import ( var _ crypto.PrivKey = PrivKey{} const ( - PrivKeyName = "tendermint/PrivKeyEd25519" - PubKeyName = "tendermint/PubKeyEd25519" + PrivKeyName = "cometbft/PrivKeyEd25519" + PubKeyName = "cometbft/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 8c48847c075..d4e56c5326b 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" ) func TestSignAndValidateEd25519(t *testing.T) { @@ -23,7 +23,7 @@ func TestSignAndValidateEd25519(t *testing.T) { assert.True(t, pubKey.VerifySignature(msg, sig)) // Mutate the signature, just one bit. - // TODO: Replace this with a much better fuzzer, tendermint/ed25519/issues/10 + // TODO: Replace this with a much better fuzzer, cometbft/ed25519/issues/10 sig[7] ^= byte(0x01) assert.False(t, pubKey.VerifySignature(msg, sig)) diff --git a/crypto/encoding/codec.go b/crypto/encoding/codec.go index 3c552ed2353..7fc2eeecb1a 100644 --- a/crypto/encoding/codec.go +++ b/crypto/encoding/codec.go @@ -3,17 +3,17 @@ package encoding import ( "fmt" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/secp256k1" - "github.com/tendermint/tendermint/libs/json" - pc "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v034x/libs/json" + pc "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) func init() { - json.RegisterType((*pc.PublicKey)(nil), "tendermint.crypto.PublicKey") - json.RegisterType((*pc.PublicKey_Ed25519)(nil), "tendermint.crypto.PublicKey_Ed25519") - json.RegisterType((*pc.PublicKey_Secp256K1)(nil), "tendermint.crypto.PublicKey_Secp256K1") + json.RegisterType((*pc.PublicKey)(nil), "cometbft.crypto.PublicKey") + json.RegisterType((*pc.PublicKey_Ed25519)(nil), "cometbft.crypto.PublicKey_Ed25519") + json.RegisterType((*pc.PublicKey_Secp256K1)(nil), "cometbft.crypto.PublicKey_Secp256K1") } // PubKeyToProto takes crypto.PubKey and transforms it to a protobuf Pubkey diff --git a/crypto/example_test.go b/crypto/example_test.go index 93168fa64c7..8f9dd9a0547 100644 --- a/crypto/example_test.go +++ b/crypto/example_test.go @@ -3,7 +3,7 @@ package crypto_test import ( "fmt" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" ) func ExampleSha256() { diff --git a/crypto/internal/benchmarking/bench.go b/crypto/internal/benchmarking/bench.go index b74b901db93..bbaa98fe51c 100644 --- a/crypto/internal/benchmarking/bench.go +++ b/crypto/internal/benchmarking/bench.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" ) // The code in this file is adapted from agl/ed25519. diff --git a/crypto/merkle/hash.go b/crypto/merkle/hash.go index d45130fe58c..6d086ee2e57 100644 --- a/crypto/merkle/hash.go +++ b/crypto/merkle/hash.go @@ -1,7 +1,7 @@ package merkle import ( - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" ) // TODO: make these have a large predefined capacity diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go index a792dfe79d3..7d262815f49 100644 --- a/crypto/merkle/proof.go +++ b/crypto/merkle/proof.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) const ( diff --git a/crypto/merkle/proof_op.go b/crypto/merkle/proof_op.go index 2731df692db..a0aa4a6f344 100644 --- a/crypto/merkle/proof_op.go +++ b/crypto/merkle/proof_op.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + cmtcrypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) //---------------------------------------- diff --git a/crypto/merkle/proof_test.go b/crypto/merkle/proof_test.go index b865e0b5bf6..d45fe97778c 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/tendermint/tendermint/crypto/tmhash" - cmtcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) const ProofOpDomino = "test:domino" diff --git a/crypto/merkle/proof_value.go b/crypto/merkle/proof_value.go index 9648d076b55..b050288cdb4 100644 --- a/crypto/merkle/proof_value.go +++ b/crypto/merkle/proof_value.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" ) const ProofOpValue = "simple:v" diff --git a/crypto/merkle/rfc6962_test.go b/crypto/merkle/rfc6962_test.go index c762cda56a4..4b051bf67c0 100644 --- a/crypto/merkle/rfc6962_test.go +++ b/crypto/merkle/rfc6962_test.go @@ -20,7 +20,7 @@ import ( "encoding/hex" "testing" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" ) func TestRFC6962Hasher(t *testing.T) { diff --git a/crypto/merkle/tree_test.go b/crypto/merkle/tree_test.go index 4c05b7ae0ae..21474f5561c 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/tendermint/tendermint/libs/rand" - . "github.com/tendermint/tendermint/libs/test" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + . "github.com/KYVENetwork/cometbft/v034x/libs/test" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" ) type testItem []byte diff --git a/crypto/random_test.go b/crypto/random_test.go index 34f7372fe28..6c2e474f823 100644 --- a/crypto/random_test.go +++ b/crypto/random_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/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 0cc5d1ad95e..ecb6ee1e05a 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/tendermint/tendermint/crypto" - cmtjson "github.com/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" ) // ------------------------------------- const ( - PrivKeyName = "tendermint/PrivKeySecp256k1" - PubKeyName = "tendermint/PubKeySecp256k1" + PrivKeyName = "cometbft/PrivKeySecp256k1" + PubKeyName = "cometbft/PubKeySecp256k1" KeyType = "secp256k1" PrivKeySize = 32 diff --git a/crypto/secp256k1/secp256k1_test.go b/crypto/secp256k1/secp256k1_test.go index 820a46d79cd..736d5df084c 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/secp256k1" underlyingSecp256k1 "github.com/btcsuite/btcd/btcec/v2" ) diff --git a/crypto/sr25519/bench_test.go b/crypto/sr25519/bench_test.go index 0561eff72a6..686c2a2e391 100644 --- a/crypto/sr25519/bench_test.go +++ b/crypto/sr25519/bench_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/internal/benchmarking" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/sr25519/encoding.go b/crypto/sr25519/encoding.go index 3640c372a68..a1a03ca9ac5 100644 --- a/crypto/sr25519/encoding.go +++ b/crypto/sr25519/encoding.go @@ -1,15 +1,15 @@ package sr25519 import ( - "github.com/tendermint/tendermint/crypto" - cmtjson "github.com/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" ) var _ crypto.PrivKey = PrivKey{} const ( - PrivKeyName = "tendermint/PrivKeySr25519" - PubKeyName = "tendermint/PubKeySr25519" + PrivKeyName = "cometbft/PrivKeySr25519" + PubKeyName = "cometbft/PubKeySr25519" // SignatureSize is the size of an Edwards25519 signature. Namely the size of a compressed // Sr25519 point, and a field element. Both of which are 32 bytes. diff --git a/crypto/sr25519/privkey.go b/crypto/sr25519/privkey.go index 271d1862718..714851c3f53 100644 --- a/crypto/sr25519/privkey.go +++ b/crypto/sr25519/privkey.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" schnorrkel "github.com/ChainSafe/go-schnorrkel" ) diff --git a/crypto/sr25519/pubkey.go b/crypto/sr25519/pubkey.go index 7fc954fc98c..8e9641a621c 100644 --- a/crypto/sr25519/pubkey.go +++ b/crypto/sr25519/pubkey.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" schnorrkel "github.com/ChainSafe/go-schnorrkel" ) diff --git a/crypto/sr25519/sr25519_test.go b/crypto/sr25519/sr25519_test.go index 1efe31cad8b..f7ce3a1fc76 100644 --- a/crypto/sr25519/sr25519_test.go +++ b/crypto/sr25519/sr25519_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/sr25519" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/sr25519" ) func TestSignAndValidateSr25519(t *testing.T) { @@ -24,7 +24,7 @@ func TestSignAndValidateSr25519(t *testing.T) { assert.True(t, pubKey.VerifySignature(msg, sig)) // Mutate the signature, just one bit. - // TODO: Replace this with a much better fuzzer, tendermint/ed25519/issues/10 + // TODO: Replace this with a much better fuzzer, cometbft/ed25519/issues/10 sig[7] ^= byte(0x01) assert.False(t, pubKey.VerifySignature(msg, sig)) diff --git a/crypto/tmhash/hash_test.go b/crypto/tmhash/hash_test.go index cf9991b3b22..95fe4059d67 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/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" ) func TestHash(t *testing.T) { diff --git a/crypto/xsalsa20symmetric/symmetric.go b/crypto/xsalsa20symmetric/symmetric.go index 74cb4b10332..d5592ba0a14 100644 --- a/crypto/xsalsa20symmetric/symmetric.go +++ b/crypto/xsalsa20symmetric/symmetric.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/nacl/secretbox" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/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 160d49a9ef7..eb8a3eb05a9 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/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" ) func TestSimple(t *testing.T) { diff --git a/docs/app-dev/getting-started.md b/docs/app-dev/getting-started.md index 5473b366335..1b9584f29ff 100644 --- a/docs/app-dev/getting-started.md +++ b/docs/app-dev/getting-started.md @@ -178,7 +178,7 @@ of the ASCII of `abcd`. You can verify this in a python 2 shell by running `"YWJjZA==".decode('base64')` or in python 3 shell by running `import codecs; codecs.decode(b"YWJjZA==", 'base64').decode('ascii')`. Stay tuned for a future release that [makes this output more -human-readable](https://github.com/tendermint/tendermint/issues/1794). +human-readable](https://github.com/KYVENetwork/cometbft/v034x/issues/1794). Now let's try setting a different key and value: diff --git a/docs/core/configuration.md b/docs/core/configuration.md index 917f28fddca..36ffbf75669 100644 --- a/docs/core/configuration.md +++ b/docs/core/configuration.md @@ -186,7 +186,7 @@ experimental_close_on_slow_client = false # How long to wait for a tx to be committed during /broadcast_tx_commit. # WARNING: Using a value larger than 10s will result in increasing the # global HTTP write timeout, which applies to all connections and endpoints. -# See https://github.com/tendermint/tendermint/issues/3435 +# See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 timeout_broadcast_tx_commit = "10s" # Maximum size of request body, in bytes @@ -328,7 +328,7 @@ max_tx_bytes = 1048576 # Maximum size of a batch of transactions to send to a peer # Including space needed by encoding (one varint per transaction). -# XXX: Unused due to https://github.com/tendermint/tendermint/issues/5796 +# XXX: Unused due to https://github.com/KYVENetwork/cometbft/v034x/issues/5796 max_batch_bytes = 0 # ttl-duration, if non-zero, defines the maximum amount of time a transaction diff --git a/docs/core/fast-sync.md b/docs/core/fast-sync.md index b3a13a34ff0..690d6952cc0 100644 --- a/docs/core/fast-sync.md +++ b/docs/core/fast-sync.md @@ -28,7 +28,7 @@ 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.34.x/blockchain/v0/pool.go#L168). -Note: There are three versions of fast sync. We recommend using v0 as v1 and v2 are still in beta. +Note: There are three versions of fast sync. We recommend using v0 as v1 and v2 are still in beta. If you would like to use a different version you can do so by changing the version in the `config.toml`: ```toml @@ -40,9 +40,9 @@ Note: There are three versions of fast sync. We recommend using v0 as v1 and v2 # Fast Sync version to use: # 1) "v0" (default) - the legacy fast sync implementation # 2) "v1" - refactor of v0 version for better testability -# 2) "v2" - complete redesign of v0, optimized for testability & readability +# 2) "v2" - complete redesign of v0, optimized for testability & readability version = "v0" ``` If we're lagging sufficiently, we should go back to fast syncing, but -this is an [open issue](https://github.com/tendermint/tendermint/issues/129). +this is an [open issue](https://github.com/KYVENetwork/cometbft/v034x/issues/129). diff --git a/docs/core/running-in-production.md b/docs/core/running-in-production.md index 88ef6686c7f..6d23c069cb8 100644 --- a/docs/core/running-in-production.md +++ b/docs/core/running-in-production.md @@ -279,7 +279,7 @@ Recommended: While for now, CometBFT stores all the history and it may require significant disk space over time, we are planning to implement state syncing (See [this -issue](https://github.com/tendermint/tendermint/issues/828)). So, storing all +issue](https://github.com/KYVENetwork/cometbft/v034x/issues/828)). So, storing all the past blocks will not be necessary. ### Validator signing on 32 bit architectures (or ARM) diff --git a/docs/core/subscription.md b/docs/core/subscription.md index 796a415ff1c..f1ccc59f109 100644 --- a/docs/core/subscription.md +++ b/docs/core/subscription.md @@ -43,16 +43,16 @@ transactions](./indexing-transactions.md) for details. ## Query parameter and event type restrictions -While CometBFT imposes no restrictions on the application with regards to the type of -the event output, there are several restrictions when it comes to querying -events whose attribute values are numeric. +While CometBFT imposes no restrictions on the application with regards to the type of +the event output, there are several restrictions when it comes to querying +events whose attribute values are numeric. - Queries cannot include negative numbers - If floating points are compared to integers, they are converted to an integer - Floating point to floating point comparison leads to a loss of precision for very big floating point numbers -(e.g., `10000000000000000000.0` is treated the same as `10000000000000000000.6`) +(e.g., `10000000000000000000.0` is treated the same as `10000000000000000000.6`) - When floating points do get converted to integers, they are always rounded down. -This has been done to preserve the behaviour present before introducing the support for BigInts in the query parameters. +This has been done to preserve the behaviour present before introducing the support for BigInts in the query parameters. ## ValidatorSetUpdates @@ -71,13 +71,13 @@ Response: "result": { "query": "tm.event='ValidatorSetUpdates'", "data": { - "type": "tendermint/event/ValidatorSetUpdates", + "type": "cometbft/event/ValidatorSetUpdates", "value": { "validator_updates": [ { "address": "09EAD022FD25DE3A02E64B0FE9610B1417183EE4", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/PubKeyEd25519", "value": "ww0z4WaZ0Xg+YI10w43wTWbBmM3dpVza4mmSQYsd0ck=" }, "voting_power": "10", diff --git a/docs/core/using-cometbft.md b/docs/core/using-cometbft.md index b50173b5ff4..c46bc198cc2 100644 --- a/docs/core/using-cometbft.md +++ b/docs/core/using-cometbft.md @@ -113,7 +113,7 @@ definition](https://github.com/cometbft/cometbft/blob/v0.34.x/types/genesis.go)) { "address": "B547AB87E79F75A4A3198C57A8C2FDAF8628CB47", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/PubKeyEd25519", "value": "P/V6GHuZrb8rs/k1oBorxc6vyXMlnzhJmv7LmjELDys=" }, "power": "10", @@ -355,7 +355,7 @@ When `cometbft init` is run, both a `genesis.json` and { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -376,12 +376,12 @@ And the `priv_validator_key.json`: "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2", "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/PubKeyEd25519" }, "last_height" : "0", "priv_key" : { "value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==", - "type" : "tendermint/PrivKeyEd25519" + "type" : "cometbft/PrivKeyEd25519" } } ``` @@ -501,11 +501,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/PubKeyEd25519" }, "priv_key" : { "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==", - "type" : "tendermint/PrivKeyEd25519" + "type" : "cometbft/PrivKeyEd25519" }, "last_step" : 0, "last_round" : "0", @@ -521,7 +521,7 @@ then the new `genesis.json` will be: { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -529,7 +529,7 @@ then the new `genesis.json` will be: { "pub_key" : { "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/PubKeyEd25519" }, "power" : 10, "name" : "" diff --git a/docs/guides/go-built-in.md b/docs/guides/go-built-in.md index 2f1611a90b3..c907da0b079 100644 --- a/docs/guides/go-built-in.md +++ b/docs/guides/go-built-in.md @@ -86,8 +86,8 @@ CometBFT. ```bash go mod init kvstore -go get github.com/tendermint/tendermint -go mod edit -replace github.com/tendermint/tendermint=github.com/cometbft/cometbft@v0.34.27 +go get github.com/cometbft/cometbft +go mod edit -replace github.com/cometbft/cometbft=github.com/cometbft/cometbft@v0.34.27 ``` After running the above commands you will see two generated files, `go.mod` and `go.sum`. diff --git a/docs/guides/upgrading-from-tm.md b/docs/guides/upgrading-from-tm.md index 5f83d342e30..b45cae57057 100644 --- a/docs/guides/upgrading-from-tm.md +++ b/docs/guides/upgrading-from-tm.md @@ -13,7 +13,7 @@ v0.34.24, or Informal Systems' public fork), you can upgrade to CometBFT v0.34.27 by replacing your dependency in your `go.mod` file: ```bash -go mod edit -replace github.com/tendermint/tendermint=github.com/cometbft/cometbft@v0.34.27 +go mod edit -replace github.com/cometbft/cometbft=github.com/cometbft/cometbft@v0.34.27 ``` We make use of the original module URL in order to minimize the impact of @@ -41,6 +41,6 @@ subsequent major release of CometBFT. If you are building CometBFT from scratch, please note that it must be compiled using Go 1.21 or higher. -[v03424]: https://github.com/tendermint/tendermint/releases/tag/v0.34.24 +[v03424]: https://github.com/KYVENetwork/cometbft/v034x/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 diff --git a/docs/qa/CometBFT-QA-34.md b/docs/qa/CometBFT-QA-34.md index d633426407e..7826340d006 100644 --- a/docs/qa/CometBFT-QA-34.md +++ b/docs/qa/CometBFT-QA-34.md @@ -200,7 +200,7 @@ The thick red dashed line represents the moving average over a sliding window of The following graph shows the that the number of peers was stable throughout the experiment. Seed nodes typically have a higher number of peers. The fact that non-seed nodes reach more than 50 peers is due to -[#9548](https://github.com/tendermint/tendermint/issues/9548). +[#9548](https://github.com/KYVENetwork/cometbft/v034x/issues/9548). ![peers](img34/baseline/peers.png) diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index e61c4e0aeb7..645bb22b790 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/types" ) // BlockStore is an autogenerated mock type for the BlockStore type diff --git a/evidence/pool.go b/evidence/pool.go index cb660a7ca80..a30387e082a 100644 --- a/evidence/pool.go +++ b/evidence/pool.go @@ -12,11 +12,11 @@ import ( "github.com/gogo/protobuf/proto" gogotypes "github.com/gogo/protobuf/types" - clist "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + clist "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/evidence/pool_test.go b/evidence/pool_test.go index 0c3bab81a02..dd7561d9407 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -1,6 +1,7 @@ package evidence_test import ( + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "os" "testing" "time" @@ -11,16 +12,15 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/evidence" - "github.com/tendermint/tendermint/evidence/mocks" - "github.com/tendermint/tendermint/libs/log" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - sm "github.com/tendermint/tendermint/state" - smmocks "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/evidence" + "github.com/KYVENetwork/cometbft/v034x/evidence/mocks" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + smmocks "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) func TestMain(m *testing.M) { diff --git a/evidence/reactor.go b/evidence/reactor.go index f214c85c064..2166a376810 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -4,12 +4,12 @@ import ( "fmt" "time" + clist "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" "github.com/gogo/protobuf/proto" - clist "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" ) const ( diff --git a/evidence/reactor_test.go b/evidence/reactor_test.go index ad62cf4ec44..d56ea5eae18 100644 --- a/evidence/reactor_test.go +++ b/evidence/reactor_test.go @@ -16,17 +16,17 @@ import ( dbm "github.com/cometbft/cometbft-db" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/evidence" - "github.com/tendermint/tendermint/evidence/mocks" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - p2pmocks "github.com/tendermint/tendermint/p2p/mocks" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/evidence" + "github.com/KYVENetwork/cometbft/v034x/evidence/mocks" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v034x/p2p/mocks" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( diff --git a/evidence/services.go b/evidence/services.go index 5c4d2e953e1..7cf9be8fdeb 100644 --- a/evidence/services.go +++ b/evidence/services.go @@ -1,7 +1,7 @@ package evidence import ( - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) //go:generate ../scripts/mockery_generate.sh BlockStore diff --git a/evidence/verify.go b/evidence/verify.go index 638594fd0c2..1d0aea61926 100644 --- a/evidence/verify.go +++ b/evidence/verify.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/types" ) // verify verifies the evidence fully by checking: diff --git a/evidence/verify_test.go b/evidence/verify_test.go index d12486f59fd..296b5b0a63e 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/v034x/proto/cometbft/v034x/v034x/version" "testing" "time" @@ -10,17 +11,16 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/evidence" - "github.com/tendermint/tendermint/evidence/mocks" - "github.com/tendermint/tendermint/libs/log" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - sm "github.com/tendermint/tendermint/state" - smmocks "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/evidence" + "github.com/KYVENetwork/cometbft/v034x/evidence/mocks" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + smmocks "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) const ( diff --git a/go.mod b/go.mod index 03fb0d1a5e6..36af4b1b6ce 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tendermint/tendermint +module github.com/KYVENetwork/cometbft/v034x go 1.21 diff --git a/libs/autofile/autofile.go b/libs/autofile/autofile.go index f652420ed8c..99be69d30f6 100644 --- a/libs/autofile/autofile.go +++ b/libs/autofile/autofile.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - cmtrand "github.com/tendermint/tendermint/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) /* AutoFile usage diff --git a/libs/autofile/autofile_test.go b/libs/autofile/autofile_test.go index 7c8e011cfaa..7ff27881ba2 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/tendermint/tendermint/libs/os" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" ) func TestSIGHUP(t *testing.T) { diff --git a/libs/autofile/cmd/logjack.go b/libs/autofile/cmd/logjack.go index d6ef7cc38c2..65fb5b5d03c 100644 --- a/libs/autofile/cmd/logjack.go +++ b/libs/autofile/cmd/logjack.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - auto "github.com/tendermint/tendermint/libs/autofile" - cmtos "github.com/tendermint/tendermint/libs/os" + auto "github.com/KYVENetwork/cometbft/v034x/libs/autofile" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" ) const Version = "0.0.1" diff --git a/libs/autofile/group.go b/libs/autofile/group.go index 7848ef131e4..354a4e05d05 100644 --- a/libs/autofile/group.go +++ b/libs/autofile/group.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) const ( diff --git a/libs/autofile/group_test.go b/libs/autofile/group_test.go index d823022fb66..71bc9cec9bf 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/tendermint/tendermint/libs/os" - cmtrand "github.com/tendermint/tendermint/libs/rand" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v034x/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 3c47afc1b33..1356a66a963 100644 --- a/libs/bits/bit_array.go +++ b/libs/bits/bit_array.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtprotobits "github.com/tendermint/tendermint/proto/tendermint/libs/bits" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtprotobits "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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 f4ed4057ac3..8fe5e5ce142 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/tendermint/tendermint/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func randBitArray(bits int) (*BitArray, []byte) { diff --git a/libs/cli/flags/log_level.go b/libs/cli/flags/log_level.go index 706305300ec..0f97357ef3e 100644 --- a/libs/cli/flags/log_level.go +++ b/libs/cli/flags/log_level.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) const ( diff --git a/libs/cli/flags/log_level_test.go b/libs/cli/flags/log_level_test.go index 1a0c2abfb5e..f60be66c03d 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/tendermint/tendermint/libs/cli/flags" - "github.com/tendermint/tendermint/libs/log" + cmtflags "github.com/KYVENetwork/cometbft/v034x/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) const ( diff --git a/libs/clist/clist.go b/libs/clist/clist.go index 8f27743e802..bed462dde5f 100644 --- a/libs/clist/clist.go +++ b/libs/clist/clist.go @@ -15,7 +15,7 @@ import ( "fmt" "sync" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/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 217c9e77998..1ed8963e366 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/tendermint/tendermint/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func TestPanicOnMaxLength(t *testing.T) { diff --git a/libs/cmap/cmap.go b/libs/cmap/cmap.go index 5e0e2b988a4..2449549fc81 100644 --- a/libs/cmap/cmap.go +++ b/libs/cmap/cmap.go @@ -1,7 +1,7 @@ package cmap import ( - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) // CMap is a goroutine-safe map diff --git a/libs/events/events.go b/libs/events/events.go index 112eddb7957..156f8820d19 100644 --- a/libs/events/events.go +++ b/libs/events/events.go @@ -4,8 +4,8 @@ package events import ( "fmt" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/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 9e21e023513..029c7417404 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/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) // TestAddListenerForEventFireOnce sets up an EventSwitch, subscribes a single diff --git a/libs/flowrate/flowrate.go b/libs/flowrate/flowrate.go index b71cffca168..e6682e3fa93 100644 --- a/libs/flowrate/flowrate.go +++ b/libs/flowrate/flowrate.go @@ -10,7 +10,7 @@ import ( "math" "time" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/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 41faa106277..2ab7a72e972 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/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/json" ) func TestUnmarshal(t *testing.T) { diff --git a/libs/json/encoder_test.go b/libs/json/encoder_test.go index 88eb56f857f..76173e2d463 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/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/json" ) func TestMarshal(t *testing.T) { diff --git a/libs/json/helpers_test.go b/libs/json/helpers_test.go index ccb3c003888..8f397ad9e96 100644 --- a/libs/json/helpers_test.go +++ b/libs/json/helpers_test.go @@ -3,7 +3,7 @@ package json_test import ( "time" - "github.com/tendermint/tendermint/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/json" ) // Register Car, an instance of the Vehicle interface. diff --git a/libs/json/structs.go b/libs/json/structs.go index d4f84788c54..8461437c2f4 100644 --- a/libs/json/structs.go +++ b/libs/json/structs.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) var ( diff --git a/libs/json/types.go b/libs/json/types.go index 8617ad831c5..fa19a17749a 100644 --- a/libs/json/types.go +++ b/libs/json/types.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) var ( diff --git a/libs/log/filter_test.go b/libs/log/filter_test.go index b2ba1839454..ab3ed283d83 100644 --- a/libs/log/filter_test.go +++ b/libs/log/filter_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestVariousLevels(t *testing.T) { diff --git a/libs/log/lazy.go b/libs/log/lazy.go index 124d841599e..7ebb738e826 100644 --- a/libs/log/lazy.go +++ b/libs/log/lazy.go @@ -3,7 +3,7 @@ package log import ( "fmt" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" ) type LazySprintf struct { diff --git a/libs/log/tm_logger_test.go b/libs/log/tm_logger_test.go index 8427febf18d..5dc2cd4c497 100644 --- a/libs/log/tm_logger_test.go +++ b/libs/log/tm_logger_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestLoggerLogsItsErrors(t *testing.T) { diff --git a/libs/log/tmfmt_logger_test.go b/libs/log/tmfmt_logger_test.go index 9642d03646f..6593833e856 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestTMFmtLogger(t *testing.T) { diff --git a/libs/log/tracing_logger_test.go b/libs/log/tracing_logger_test.go index f32ac9c57cb..e075937337a 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestTracingLogger(t *testing.T) { diff --git a/libs/os/os.go b/libs/os/os.go index 16aa3e68bb4..ae4b4effcfe 100644 --- a/libs/os/os.go +++ b/libs/os/os.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) type logger interface { diff --git a/libs/os/os_test.go b/libs/os/os_test.go index 7c43476e884..c59da3cc3d5 100644 --- a/libs/os/os_test.go +++ b/libs/os/os_test.go @@ -73,7 +73,7 @@ func TestEnsureDir(t *testing.T) { // Ensure that using CopyFile does not truncate the destination file before // the origin is positively a non-directory and that it is ready for copying. -// See https://github.com/tendermint/tendermint/issues/6427 +// See https://github.com/KYVENetwork/cometbft/v034x/issues/6427 func TestTrickedTruncation(t *testing.T) { tmpDir, err := os.MkdirTemp(os.TempDir(), "pwn_truncate") if err != nil { diff --git a/libs/protoio/io_test.go b/libs/protoio/io_test.go index 201739d5293..00c444481ea 100644 --- a/libs/protoio/io_test.go +++ b/libs/protoio/io_test.go @@ -41,7 +41,7 @@ import ( "github.com/gogo/protobuf/test" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/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 6abd5de5c49..cb2f98e99a8 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" - "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) func TestExample(t *testing.T) { diff --git a/libs/pubsub/pubsub.go b/libs/pubsub/pubsub.go index 718e80fea22..56271407272 100644 --- a/libs/pubsub/pubsub.go +++ b/libs/pubsub/pubsub.go @@ -38,8 +38,8 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) type operation int diff --git a/libs/pubsub/pubsub_test.go b/libs/pubsub/pubsub_test.go index 8482a13fa75..428f4099d98 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" - "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) const ( diff --git a/libs/pubsub/query/empty_test.go b/libs/pubsub/query/empty_test.go index 1b6ef282854..d737e6a3a73 100644 --- a/libs/pubsub/query/empty_test.go +++ b/libs/pubsub/query/empty_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) func TestEmptyQueryMatchesAnything(t *testing.T) { diff --git a/libs/pubsub/query/fuzz_test/main.go b/libs/pubsub/query/fuzz_test/main.go index 7a46116b500..056e90f0941 100644 --- a/libs/pubsub/query/fuzz_test/main.go +++ b/libs/pubsub/query/fuzz_test/main.go @@ -3,7 +3,7 @@ package fuzz_test import ( "fmt" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) func Fuzz(data []byte) int { diff --git a/libs/pubsub/query/parser_test.go b/libs/pubsub/query/parser_test.go index a08a0d16d00..752e85be74e 100644 --- a/libs/pubsub/query/parser_test.go +++ b/libs/pubsub/query/parser_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) // TODO: fuzzy testing? diff --git a/libs/pubsub/query/query_test.go b/libs/pubsub/query/query_test.go index 34ea0d0c001..49b5bdec16d 100644 --- a/libs/pubsub/query/query_test.go +++ b/libs/pubsub/query/query_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) func TestBigNumbers(t *testing.T) { diff --git a/libs/pubsub/subscription.go b/libs/pubsub/subscription.go index 5f8994220f5..4146c22ff81 100644 --- a/libs/pubsub/subscription.go +++ b/libs/pubsub/subscription.go @@ -3,7 +3,7 @@ package pubsub import ( "errors" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) var ( diff --git a/libs/rand/random.go b/libs/rand/random.go index c79eea7e821..1cd94069416 100644 --- a/libs/rand/random.go +++ b/libs/rand/random.go @@ -5,7 +5,7 @@ import ( mrand "math/rand" "time" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) const ( @@ -300,7 +300,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/tendermint/tendermint/crypto for a more secure reader. +// See github.com/KYVENetwork/cometbft/v034x/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 a3f1b4cb608..5136786b98c 100644 --- a/libs/service/service.go +++ b/libs/service/service.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) var ( diff --git a/libs/tempfile/tempfile.go b/libs/tempfile/tempfile.go index a72a4381b5c..b054fce9d6e 100644 --- a/libs/tempfile/tempfile.go +++ b/libs/tempfile/tempfile.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) const ( diff --git a/libs/tempfile/tempfile_test.go b/libs/tempfile/tempfile_test.go index 0314c8664ac..bfaa41ba6e7 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/tendermint/tendermint/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func TestWriteFileAtomic(t *testing.T) { diff --git a/libs/test/mutate.go b/libs/test/mutate.go index 7b98ee9b288..dbd1b3af229 100644 --- a/libs/test/mutate.go +++ b/libs/test/mutate.go @@ -1,7 +1,7 @@ package test import ( - cmtrand "github.com/tendermint/tendermint/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v034x/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 a6d6a8974f6..1243b13b730 100644 --- a/libs/timer/throttle_timer.go +++ b/libs/timer/throttle_timer.go @@ -3,7 +3,7 @@ package timer import ( "time" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) /* diff --git a/libs/timer/throttle_timer_test.go b/libs/timer/throttle_timer_test.go index 74434bbbbf8..bd2f8927af6 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/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) type thCounter struct { diff --git a/light/client.go b/light/client.go index 10dd2c2eaa1..75eee4c1ac4 100644 --- a/light/client.go +++ b/light/client.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/light/provider" - "github.com/tendermint/tendermint/light/store" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + "github.com/KYVENetwork/cometbft/v034x/light/store" + "github.com/KYVENetwork/cometbft/v034x/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/tendermint/tendermint/blob/v0.34.x/spec/consensus/light-client.md +// https://github.com/KYVENetwork/cometbft/v034x/blob/v0.34.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 32e309aabf0..5aad9373820 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/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/light/provider" - mockp "github.com/tendermint/tendermint/light/provider/mock" - dbs "github.com/tendermint/tendermint/light/store/db" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + mockp "github.com/KYVENetwork/cometbft/v034x/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v034x/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 5e00731a2c9..88c8127c4c9 100644 --- a/light/client_test.go +++ b/light/client_test.go @@ -12,12 +12,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/light/provider" - mockp "github.com/tendermint/tendermint/light/provider/mock" - dbs "github.com/tendermint/tendermint/light/store/db" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + mockp "github.com/KYVENetwork/cometbft/v034x/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v034x/light/store/db" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/light/detector.go b/light/detector.go index 2c55c172924..794c8dc27c9 100644 --- a/light/detector.go +++ b/light/detector.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/light/provider" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + "github.com/KYVENetwork/cometbft/v034x/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 5178077980c..376c1ddca63 100644 --- a/light/detector_test.go +++ b/light/detector_test.go @@ -9,12 +9,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/light/provider" - mockp "github.com/tendermint/tendermint/light/provider/mock" - dbs "github.com/tendermint/tendermint/light/store/db" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + mockp "github.com/KYVENetwork/cometbft/v034x/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v034x/light/store/db" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestLightClientAttackEvidence_Lunatic(t *testing.T) { diff --git a/light/errors.go b/light/errors.go index 73ed232b3c7..1cef393358d 100644 --- a/light/errors.go +++ b/light/errors.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // ErrOldHeaderExpired means the old (trusted) header has expired according to diff --git a/light/example_test.go b/light/example_test.go index 3e5f8bf5bc3..6871d1e5232 100644 --- a/light/example_test.go +++ b/light/example_test.go @@ -10,13 +10,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/light/provider" - httpp "github.com/tendermint/tendermint/light/provider/http" - dbs "github.com/tendermint/tendermint/light/store/db" - rpctest "github.com/tendermint/tendermint/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + httpp "github.com/KYVENetwork/cometbft/v034x/light/provider/http" + dbs "github.com/KYVENetwork/cometbft/v034x/light/store/db" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" ) // Automatically getting new headers and verifying them. diff --git a/light/helpers_test.go b/light/helpers_test.go index 13bd09740cb..d43830567f1 100644 --- a/light/helpers_test.go +++ b/light/helpers_test.go @@ -1,16 +1,16 @@ package light_test import ( + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "time" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" ) // privKeys is a helper type for testing. diff --git a/light/provider/http/http.go b/light/provider/http/http.go index 430dddd54a7..4827dae0a85 100644 --- a/light/provider/http/http.go +++ b/light/provider/http/http.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/tendermint/tendermint/light/provider" - rpcclient "github.com/tendermint/tendermint/rpc/client" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( - // This is very brittle, see: https://github.com/tendermint/tendermint/issues/4740 + // This is very brittle, see: https://github.com/KYVENetwork/cometbft/v034x/issues/4740 regexpMissingHeight = regexp.MustCompile(`height \d+ is not available`) regexpTooHigh = regexp.MustCompile(`height \d+ must be less than or equal to`) regexpTimedOut = regexp.MustCompile(`Timeout exceeded`) diff --git a/light/provider/http/http_test.go b/light/provider/http/http_test.go index 36be4d281ad..2ceee21e3e8 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/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/light/provider" - lighthttp "github.com/tendermint/tendermint/light/provider/http" - rpcclient "github.com/tendermint/tendermint/rpc/client" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpctest "github.com/tendermint/tendermint/rpc/test" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + lighthttp "github.com/KYVENetwork/cometbft/v034x/light/provider/http" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestNewProvider(t *testing.T) { diff --git a/light/provider/mock/deadmock.go b/light/provider/mock/deadmock.go index dbf5b779e0b..16ca4f310b7 100644 --- a/light/provider/mock/deadmock.go +++ b/light/provider/mock/deadmock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/tendermint/tendermint/light/provider" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + "github.com/KYVENetwork/cometbft/v034x/types" ) type deadMock struct { diff --git a/light/provider/mock/mock.go b/light/provider/mock/mock.go index 0c3f0892716..6f21ace62e9 100644 --- a/light/provider/mock/mock.go +++ b/light/provider/mock/mock.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/tendermint/tendermint/light/provider" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + "github.com/KYVENetwork/cometbft/v034x/types" ) type Mock struct { diff --git a/light/provider/provider.go b/light/provider/provider.go index 80e8dbc15c9..c2e46b12b26 100644 --- a/light/provider/provider.go +++ b/light/provider/provider.go @@ -3,7 +3,7 @@ package provider import ( "context" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Provider provides information for the light client to sync (verification diff --git a/light/proxy/proxy.go b/light/proxy/proxy.go index 6ceedd5a6b0..1fcd9913255 100644 --- a/light/proxy/proxy.go +++ b/light/proxy/proxy.go @@ -6,12 +6,12 @@ import ( "net" "net/http" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/light" - lrpc "github.com/tendermint/tendermint/light/rpc" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/light" + lrpc "github.com/KYVENetwork/cometbft/v034x/light/rpc" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + rpcserver "github.com/KYVENetwork/cometbft/v034x/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 2898853d265..acd1bf9a64b 100644 --- a/light/proxy/routes.go +++ b/light/proxy/routes.go @@ -1,13 +1,13 @@ package proxy import ( - "github.com/tendermint/tendermint/libs/bytes" - lrpc "github.com/tendermint/tendermint/light/rpc" - rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + lrpc "github.com/KYVENetwork/cometbft/v034x/light/rpc" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) func RPCRoutes(c *lrpc.Client) map[string]*rpcserver.RPCFunc { diff --git a/light/rpc/client.go b/light/rpc/client.go index 73e4e82dc3e..c4e61903459 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -10,15 +10,15 @@ import ( "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/merkle" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtmath "github.com/tendermint/tendermint/libs/math" - service "github.com/tendermint/tendermint/libs/service" - rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + service "github.com/KYVENetwork/cometbft/v034x/libs/service" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/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 fabf73b01e8..0426800dee2 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/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/types" ) // LightClient is an autogenerated mock type for the LightClient type diff --git a/light/setup.go b/light/setup.go index af72301b069..1df80fa08c4 100644 --- a/light/setup.go +++ b/light/setup.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/tendermint/tendermint/light/provider" - "github.com/tendermint/tendermint/light/provider/http" - "github.com/tendermint/tendermint/light/store" + "github.com/KYVENetwork/cometbft/v034x/light/provider" + "github.com/KYVENetwork/cometbft/v034x/light/provider/http" + "github.com/KYVENetwork/cometbft/v034x/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 37666fdcfd7..c753f77d4cc 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/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/light/store" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/light/store" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( diff --git a/light/store/db/db_test.go b/light/store/db/db_test.go index 24c22fab1d0..00ef49eedad 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/v034x/proto/cometbft/v034x/v034x/version" "sync" "testing" "time" @@ -10,12 +11,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) func TestLast_FirstLightBlockHeight(t *testing.T) { diff --git a/light/store/store.go b/light/store/store.go index 7c29f233dc8..b05ed5a0462 100644 --- a/light/store/store.go +++ b/light/store/store.go @@ -1,6 +1,6 @@ package store -import "github.com/tendermint/tendermint/types" +import "github.com/KYVENetwork/cometbft/v034x/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 cbf3b1cd8e9..5dd3c47ac97 100644 --- a/light/trust_options.go +++ b/light/trust_options.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" ) // TrustOptions are the trust parameters needed when a new light client diff --git a/light/verifier.go b/light/verifier.go index e0ad91c2b6f..fd1e1a7fb4d 100644 --- a/light/verifier.go +++ b/light/verifier.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( diff --git a/light/verifier_test.go b/light/verifier_test.go index cd2049ee8e4..1f4638b7e6d 100644 --- a/light/verifier_test.go +++ b/light/verifier_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/mempool/cache.go b/mempool/cache.go index 3c8748ff431..8db46819093 100644 --- a/mempool/cache.go +++ b/mempool/cache.go @@ -3,8 +3,8 @@ package mempool import ( "container/list" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/types" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/types" ) // TxCache defines an interface for raw transaction caching in a mempool. diff --git a/mempool/ids_test.go b/mempool/ids_test.go index 2d72076e7a6..71cc4c9fc36 100644 --- a/mempool/ids_test.go +++ b/mempool/ids_test.go @@ -4,7 +4,7 @@ package mempool // "testing" // "github.com/stretchr/testify/require" -// "github.com/tendermint/tendermint/types" +// "github.com/KYVENetwork/cometbft/v034x/types" // ) // func TestMempoolIDsBasic(t *testing.T) { diff --git a/mempool/mempool.go b/mempool/mempool.go index 83613245dec..210f0ba7332 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -6,8 +6,8 @@ import ( "fmt" "math" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/mempool/mock/mempool.go b/mempool/mock/mempool.go index 3f293381fad..8fcfbe14db8 100644 --- a/mempool/mock/mempool.go +++ b/mempool/mock/mempool.go @@ -1,10 +1,10 @@ package mock import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Mempool is an empty implementation of a Mempool, useful for testing. diff --git a/mempool/tx.go b/mempool/tx.go index d13f3d6b803..d2a09f80d66 100644 --- a/mempool/tx.go +++ b/mempool/tx.go @@ -1,7 +1,7 @@ package mempool import ( - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // TxInfo are parameters that get passed when attempting to add a tx to the diff --git a/mempool/v0/bench_test.go b/mempool/v0/bench_test.go index cb1be502a86..89c9ab1f5c3 100644 --- a/mempool/v0/bench_test.go +++ b/mempool/v0/bench_test.go @@ -5,9 +5,9 @@ import ( "sync/atomic" "testing" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" ) func BenchmarkReap(b *testing.B) { diff --git a/mempool/v0/cache_test.go b/mempool/v0/cache_test.go index c62e99891af..a7115fc0390 100644 --- a/mempool/v0/cache_test.go +++ b/mempool/v0/cache_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestCacheAfterUpdate(t *testing.T) { diff --git a/mempool/v0/clist_mempool.go b/mempool/v0/clist_mempool.go index df905a5e93a..41a65a00b13 100644 --- a/mempool/v0/clist_mempool.go +++ b/mempool/v0/clist_mempool.go @@ -6,16 +6,16 @@ import ( "sync" "sync/atomic" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) // CListMempool is an ordered in-memory pool for transactions before they are @@ -627,7 +627,7 @@ func (mem *CListMempool) Update( // 101 -> 102 // Mempool after: // 100 - // https://github.com/tendermint/tendermint/issues/3322. + // https://github.com/KYVENetwork/cometbft/v034x/issues/3322. if e, ok := mem.txsMap.Load(tx.Key()); ok { mem.removeTx(tx, e.(*clist.CElement), false) } diff --git a/mempool/v0/clist_mempool_test.go b/mempool/v0/clist_mempool_test.go index 8d9678238d2..bb14e82108e 100644 --- a/mempool/v0/clist_mempool_test.go +++ b/mempool/v0/clist_mempool_test.go @@ -15,18 +15,18 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abciclient "github.com/tendermint/tendermint/abci/client" - abciclimocks "github.com/tendermint/tendermint/abci/client/mocks" - "github.com/tendermint/tendermint/abci/example/kvstore" - abciserver "github.com/tendermint/tendermint/abci/server" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abciclient "github.com/KYVENetwork/cometbft/v034x/abci/client" + abciclimocks "github.com/KYVENetwork/cometbft/v034x/abci/client/mocks" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abciserver "github.com/KYVENetwork/cometbft/v034x/abci/server" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) // A cleanupFunc cleans up any config / test files created for a particular @@ -695,7 +695,7 @@ func TestMempoolNoCacheOverflow(t *testing.T) { } // This will non-deterministically catch some concurrency failures like -// https://github.com/tendermint/tendermint/issues/3509 +// https://github.com/KYVENetwork/cometbft/v034x/issues/3509 // TODO: all of the tests should probably also run using the remote proxy app // since otherwise we're not actually testing the concurrency of the mempool here! func TestMempoolRemoteAppConcurrency(t *testing.T) { diff --git a/mempool/v0/reactor.go b/mempool/v0/reactor.go index 03f895bd5ce..d69b72baea7 100644 --- a/mempool/v0/reactor.go +++ b/mempool/v0/reactor.go @@ -8,14 +8,14 @@ import ( "github.com/gogo/protobuf/proto" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - protomem "github.com/tendermint/tendermint/proto/tendermint/mempool" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + protomem "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/types" "golang.org/x/sync/semaphore" ) @@ -305,7 +305,7 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) { } // NOTE: Transaction batching was disabled due to - // https://github.com/tendermint/tendermint/issues/5796 + // https://github.com/KYVENetwork/cometbft/v034x/issues/5796 if _, ok := memTx.senders.Load(peerID); !ok { success := p2p.SendEnvelopeShim(peer, p2p.Envelope{ //nolint: staticcheck diff --git a/mempool/v0/reactor_test.go b/mempool/v0/reactor_test.go index ed8bb4dc2f8..d9fdc8f2256 100644 --- a/mempool/v0/reactor_test.go +++ b/mempool/v0/reactor_test.go @@ -14,17 +14,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/mock" - memproto "github.com/tendermint/tendermint/proto/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/mock" + memproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( @@ -67,7 +67,7 @@ func TestReactorBroadcastTxsMessage(t *testing.T) { waitForTxsOnReactors(t, txs, reactors) } -// regression test for https://github.com/tendermint/tendermint/issues/5408 +// regression test for https://github.com/KYVENetwork/cometbft/v034x/issues/5408 func TestReactorConcurrency(t *testing.T) { config := cfg.TestConfig() const N = 2 @@ -268,7 +268,7 @@ func TestMempoolIDsPanicsIfNodeRequestsOvermaxActiveIDs(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/tendermint/tendermint/issues/9639 +// https://github.com/KYVENetwork/cometbft/v034x/issues/9639 func TestDontExhaustMaxActiveIDs(t *testing.T) { config := cfg.TestConfig() const N = 1 diff --git a/mempool/v1/mempool.go b/mempool/v1/mempool.go index 5fea3496474..56f2029da7f 100644 --- a/mempool/v1/mempool.go +++ b/mempool/v1/mempool.go @@ -10,13 +10,13 @@ import ( "github.com/creachadair/taskgroup" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) var _ mempool.Mempool = (*TxMempool)(nil) diff --git a/mempool/v1/mempool_bench_test.go b/mempool/v1/mempool_bench_test.go index a26501275d4..618984f1f8f 100644 --- a/mempool/v1/mempool_bench_test.go +++ b/mempool/v1/mempool_bench_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/mempool" + "github.com/KYVENetwork/cometbft/v034x/mempool" ) func BenchmarkTxMempool_CheckTx(b *testing.B) { diff --git a/mempool/v1/mempool_test.go b/mempool/v1/mempool_test.go index 7e62b9100af..5bea40c1113 100644 --- a/mempool/v1/mempool_test.go +++ b/mempool/v1/mempool_test.go @@ -15,14 +15,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/code" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) // application extends the KV store application by overriding CheckTx to provide diff --git a/mempool/v1/reactor.go b/mempool/v1/reactor.go index 8a7ddca697a..269a4fadcfd 100644 --- a/mempool/v1/reactor.go +++ b/mempool/v1/reactor.go @@ -7,14 +7,14 @@ import ( "github.com/gogo/protobuf/proto" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/clist" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - protomem "github.com/tendermint/tendermint/proto/tendermint/mempool" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + protomem "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Reactor handles mempool tx broadcasting amongst peers. @@ -260,7 +260,7 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) { } // NOTE: Transaction batching was disabled due to - // https://github.com/tendermint/tendermint/issues/5796 + // https://github.com/KYVENetwork/cometbft/v034x/issues/5796 if !memTx.HasPeer(peerID) { success := p2p.SendEnvelopeShim(peer, p2p.Envelope{ //nolint: staticcheck ChannelID: mempool.MempoolChannel, diff --git a/mempool/v1/reactor_test.go b/mempool/v1/reactor_test.go index 74f9f469ffd..940163dc77a 100644 --- a/mempool/v1/reactor_test.go +++ b/mempool/v1/reactor_test.go @@ -12,17 +12,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/p2p/mock" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/p2p/mock" - cfg "github.com/tendermint/tendermint/config" + cfg "github.com/KYVENetwork/cometbft/v034x/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - memproto "github.com/tendermint/tendermint/proto/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + memproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/mempool/v1/tx.go b/mempool/v1/tx.go index 88522a8a7f3..7bc7c36850a 100644 --- a/mempool/v1/tx.go +++ b/mempool/v1/tx.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // WrappedTx defines a wrapper around a raw transaction with additional metadata diff --git a/node/id.go b/node/id.go index ffa162f8157..0e9eac7a79c 100644 --- a/node/id.go +++ b/node/id.go @@ -3,7 +3,7 @@ package node import ( "time" - "github.com/tendermint/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto" ) type ID struct { diff --git a/node/node.go b/node/node.go index ae16caca8a4..608b3ab743d 100644 --- a/node/node.go +++ b/node/node.go @@ -15,43 +15,43 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/cors" - abci "github.com/tendermint/tendermint/abci/types" - bcv0 "github.com/tendermint/tendermint/blockchain/v0" - bcv1 "github.com/tendermint/tendermint/blockchain/v1" - bcv2 "github.com/tendermint/tendermint/blockchain/v2" - cfg "github.com/tendermint/tendermint/config" - cs "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/evidence" - - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/light" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/pex" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - rpccore "github.com/tendermint/tendermint/rpc/core" - grpccore "github.com/tendermint/tendermint/rpc/grpc" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" - blockidxnull "github.com/tendermint/tendermint/state/indexer/block/null" - "github.com/tendermint/tendermint/state/indexer/sink/psql" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/state/txindex/kv" - "github.com/tendermint/tendermint/state/txindex/null" - "github.com/tendermint/tendermint/statesync" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + bcv0 "github.com/KYVENetwork/cometbft/v034x/blockchain/v0" + bcv1 "github.com/KYVENetwork/cometbft/v034x/blockchain/v1" + bcv2 "github.com/KYVENetwork/cometbft/v034x/blockchain/v2" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cs "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/evidence" + + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/light" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/pex" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + rpccore "github.com/KYVENetwork/cometbft/v034x/rpc/core" + grpccore "github.com/KYVENetwork/cometbft/v034x/rpc/grpc" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + blockidxkv "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/kv" + blockidxnull "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/null" + "github.com/KYVENetwork/cometbft/v034x/state/indexer/sink/psql" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/null" + "github.com/KYVENetwork/cometbft/v034x/statesync" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" _ "net/http/pprof" //nolint: gosec // securely exposed on separate, optional port @@ -135,7 +135,7 @@ func DefaultMetricsProvider(config *cfg.InstrumentationConfig) MetricsProvider { type Option func(*Node) // Temporary interface for switching to fast sync, we should get rid of v0 and v1 reactors. -// See: https://github.com/tendermint/tendermint/issues/4595 +// See: https://github.com/KYVENetwork/cometbft/v034x/issues/4595 type fastSyncReactor interface { SwitchToFastSync(sm.State) error } @@ -639,7 +639,7 @@ func createPEXReactorAndAddToSwitch(addrBook pex.AddrBook, config *cfg.Config, // blocks assuming 10s blocks ~ 28 hours. // TODO (melekes): make it dynamic based on the actual block latencies // from the live network. - // https://github.com/tendermint/tendermint/issues/3523 + // https://github.com/KYVENetwork/cometbft/v034x/issues/3523 SeedDisconnectWaitPeriod: 28 * time.Hour, PersistentPeersMaxDialPeriod: config.P2P.PersistentPeersMaxDialPeriod, }) @@ -855,7 +855,7 @@ func NewNodeWithContext(ctx context.Context, // Set up state sync reactor, and schedule a sync if requested. // FIXME The way we do phased startups (e.g. replay -> fast sync -> consensus) is very messy, // we should clean this whole thing up. See: - // https://github.com/tendermint/tendermint/issues/4644 + // https://github.com/KYVENetwork/cometbft/v034x/issues/4644 stateSyncReactor := statesync.NewReactor( *config.StateSync, proxyApp.Snapshot(), @@ -1142,7 +1142,7 @@ func (n *Node) startRPC() ([]net.Listener, error) { config.MaxOpenConnections = n.config.RPC.MaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if config.WriteTimeout <= n.config.RPC.TimeoutBroadcastTxCommit { config.WriteTimeout = n.config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } @@ -1222,7 +1222,7 @@ func (n *Node) startRPC() ([]net.Listener, error) { config.MaxOpenConnections = n.config.RPC.GRPCMaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if config.WriteTimeout <= n.config.RPC.TimeoutBroadcastTxCommit { config.WriteTimeout = n.config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } diff --git a/node/node_test.go b/node/node_test.go index 30c883a686d..45d4a660f4a 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -14,24 +14,24 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/kvstore" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/evidence" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/conn" - p2pmock "github.com/tendermint/tendermint/p2p/mock" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/evidence" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + p2pmock "github.com/KYVENetwork/cometbft/v034x/p2p/mock" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) func TestNodeStartStop(t *testing.T) { diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index 87e145fb20c..6457ede6dea 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -1,8 +1,8 @@ package p2p import ( - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) // Reactor is responsible for handling incoming messages on one or more diff --git a/p2p/conn/conn_go110.go b/p2p/conn/conn_go110.go index 459c3169b14..cc600f8fe96 100644 --- a/p2p/conn/conn_go110.go +++ b/p2p/conn/conn_go110.go @@ -7,7 +7,7 @@ package conn // has the SetDeadline method implemented as per // https://github.com/golang/go/commit/e2dd8ca946be884bb877e074a21727f1a685a706 // lest we run into problems like -// https://github.com/tendermint/tendermint/issues/851 +// https://github.com/KYVENetwork/cometbft/v034x/issues/851 import "net" diff --git a/p2p/conn/conn_notgo110.go b/p2p/conn/conn_notgo110.go index 96f9a2a7ea6..21bb4d40b79 100644 --- a/p2p/conn/conn_notgo110.go +++ b/p2p/conn/conn_notgo110.go @@ -15,11 +15,11 @@ import ( // // lest we run into problems like // -// https://github.com/tendermint/tendermint/issues/851 +// https://github.com/KYVENetwork/cometbft/v034x/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/tendermint/tendermint/commit/49faa79bdce5663894b3febbf4955fb1d172df04 +// Before https://github.com/KYVENetwork/cometbft/v034x/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 da50c7f7e94..bfc31b6b35f 100644 --- a/p2p/conn/connection.go +++ b/p2p/conn/connection.go @@ -14,14 +14,14 @@ import ( "github.com/gogo/protobuf/proto" - flow "github.com/tendermint/tendermint/libs/flowrate" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/libs/protoio" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/libs/timer" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + flow "github.com/KYVENetwork/cometbft/v034x/libs/flowrate" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/timer" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) const ( @@ -612,7 +612,7 @@ FOR_LOOP: switch pkt := packet.Sum.(type) { case *tmp2p.Packet_PacketPing: // TODO: prevent abuse, as they cause flush()'s. - // https://github.com/tendermint/tendermint/issues/1190 + // https://github.com/KYVENetwork/cometbft/v034x/issues/1190 c.Logger.Debug("Receive Ping") select { case c.pong <- struct{}{}: diff --git a/p2p/conn/connection_test.go b/p2p/conn/connection_test.go index f59df3dc8b0..0962bfceb8a 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/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/protoio" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" - "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const maxPingPongPacketSize = 1024 // bytes @@ -276,7 +276,7 @@ func TestMConnectionMultiplePings(t *testing.T) { defer mconn.Stop() //nolint:errcheck // ignore for tests // sending 3 pings in a row (abuse) - // see https://github.com/tendermint/tendermint/issues/1190 + // see https://github.com/KYVENetwork/cometbft/v034x/issues/1190 protoReader := protoio.NewDelimitedReader(server, maxPingPongPacketSize) protoWriter := protoio.NewDelimitedWriter(server) var pkt tmp2p.Packet diff --git a/p2p/conn/evil_secret_connection_test.go b/p2p/conn/evil_secret_connection_test.go index 43e4d8743cc..b1ade8f94f3 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/libs/protoio" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) type buffer struct { diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go index 89adf06f748..d6d7d0ea5cf 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/libs/async" - "github.com/tendermint/tendermint/libs/protoio" - cmtsync "github.com/tendermint/tendermint/libs/sync" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/libs/async" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) // 4 + 1024 == 1028 total frame size @@ -53,13 +53,13 @@ var ( // SecretConnection implements net.Conn. // It is an implementation of the STS protocol. -// See https://github.com/tendermint/tendermint/blob/0.1/docs/sts-final.pdf for +// See https://github.com/KYVENetwork/cometbft/v034x/blob/0.1/docs/sts-final.pdf for // details on the protocol. // // Consumers of the SecretConnection are responsible for authenticating // the remote peer's pubkey against known information, like a nodeID. // Otherwise they are vulnerable to MITM. -// (TODO(ismail): see also https://github.com/tendermint/tendermint/issues/3010) +// (TODO(ismail): see also https://github.com/KYVENetwork/cometbft/v034x/issues/3010) type SecretConnection struct { // immutable @@ -456,7 +456,7 @@ func incrNonce(nonce *[aeadNonceSize]byte) { counter := binary.LittleEndian.Uint64(nonce[4:]) if counter == math.MaxUint64 { // Terminates the session and makes sure the nonce would not re-used. - // See https://github.com/tendermint/tendermint/issues/3531 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3531 panic("can't increase nonce without overflow") } counter++ diff --git a/p2p/conn/secret_connection_test.go b/p2p/conn/secret_connection_test.go index 7f06155aa65..a5ae48ac80b 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/sr25519" - "github.com/tendermint/tendermint/libs/async" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtrand "github.com/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/sr25519" + "github.com/KYVENetwork/cometbft/v034x/libs/async" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) // Run go test -update from within this module diff --git a/p2p/conn_set.go b/p2p/conn_set.go index 0a568c37f6e..f5cc44fb1c9 100644 --- a/p2p/conn_set.go +++ b/p2p/conn_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) // ConnSet is a lookup table for connections and all their ips. diff --git a/p2p/fuzz.go b/p2p/fuzz.go index 5110a101a2c..8a311621c1e 100644 --- a/p2p/fuzz.go +++ b/p2p/fuzz.go @@ -4,9 +4,9 @@ import ( "net" "time" - "github.com/tendermint/tendermint/config" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/config" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtsync "github.com/KYVENetwork/cometbft/v034x/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 51b604f9893..e2b5195c83c 100644 --- a/p2p/key.go +++ b/p2p/key.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtos "github.com/tendermint/tendermint/libs/os" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" ) // ID is a hex-encoded crypto.Address diff --git a/p2p/key_test.go b/p2p/key_test.go index 4930900b870..464128a9f18 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/tendermint/tendermint/crypto/ed25519" - cmtrand "github.com/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func TestLoadOrGenNodeKey(t *testing.T) { diff --git a/p2p/mock/peer.go b/p2p/mock/peer.go index 31ce856237f..f9b278ae106 100644 --- a/p2p/mock/peer.go +++ b/p2p/mock/peer.go @@ -3,10 +3,10 @@ package mock import ( "net" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) type Peer struct { diff --git a/p2p/mock/reactor.go b/p2p/mock/reactor.go index 8443ac8f11c..5ec482e9329 100644 --- a/p2p/mock/reactor.go +++ b/p2p/mock/reactor.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) type Reactor struct { diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index a9151c7d862..8d8e09a3ccb 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -3,14 +3,14 @@ package mocks import ( - log "github.com/tendermint/tendermint/libs/log" - conn "github.com/tendermint/tendermint/p2p/conn" + log "github.com/KYVENetwork/cometbft/v034x/libs/log" + conn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" mock "github.com/stretchr/testify/mock" net "net" - p2p "github.com/tendermint/tendermint/p2p" + p2p "github.com/KYVENetwork/cometbft/v034x/p2p" ) // Peer is an autogenerated mock type for the Peer type diff --git a/p2p/mocks/peer_envelope_sender.go b/p2p/mocks/peer_envelope_sender.go index 89f231104d4..5fd55c3495d 100644 --- a/p2p/mocks/peer_envelope_sender.go +++ b/p2p/mocks/peer_envelope_sender.go @@ -3,14 +3,14 @@ package mocks import ( - log "github.com/tendermint/tendermint/libs/log" - conn "github.com/tendermint/tendermint/p2p/conn" + log "github.com/KYVENetwork/cometbft/v034x/libs/log" + conn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" mock "github.com/stretchr/testify/mock" net "net" - p2p "github.com/tendermint/tendermint/p2p" + p2p "github.com/KYVENetwork/cometbft/v034x/p2p" ) // PeerEnvelopeSender is an autogenerated mock type for the PeerEnvelopeSender type diff --git a/p2p/netaddress.go b/p2p/netaddress.go index b8e0c241969..3fa91f17bd5 100644 --- a/p2p/netaddress.go +++ b/p2p/netaddress.go @@ -14,7 +14,7 @@ import ( "strings" "time" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) // EmptyNetAddress defines the string representation of an empty NetAddress diff --git a/p2p/node_info.go b/p2p/node_info.go index 6a596087421..f8cb6dee2fc 100644 --- a/p2p/node_info.go +++ b/p2p/node_info.go @@ -6,10 +6,10 @@ import ( "fmt" "reflect" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtstrings "github.com/tendermint/tendermint/libs/strings" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" - "github.com/tendermint/tendermint/version" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtstrings "github.com/KYVENetwork/cometbft/v034x/libs/strings" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/version" ) const ( diff --git a/p2p/node_info_test.go b/p2p/node_info_test.go index 9c317f8a168..4e01b946c35 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/tendermint/tendermint/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" ) func TestNodeInfoValidate(t *testing.T) { diff --git a/p2p/peer.go b/p2p/peer.go index 49c0dd4e40e..0b2c6b80a44 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -8,11 +8,11 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/libs/cmap" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/libs/cmap" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" - cmtconn "github.com/tendermint/tendermint/p2p/conn" + cmtconn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) //go:generate ../scripts/mockery_generate.sh Peer diff --git a/p2p/peer_set.go b/p2p/peer_set.go index c27d579801c..e1ba9b65a73 100644 --- a/p2p/peer_set.go +++ b/p2p/peer_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/tendermint/tendermint/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v034x/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 6501dd77a56..479de6ca8b4 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/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) // mockPeer for testing the PeerSet diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 16fc6536302..93285fbb5f9 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/proto/tendermint/p2p" - - "github.com/tendermint/tendermint/config" - cmtconn "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" + + "github.com/KYVENetwork/cometbft/v034x/config" + cmtconn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) func TestPeerBasic(t *testing.T) { diff --git a/p2p/pex/addrbook.go b/p2p/pex/addrbook.go index a6a6c6dbc6e..0d1146b5ffd 100644 --- a/p2p/pex/addrbook.go +++ b/p2p/pex/addrbook.go @@ -16,13 +16,13 @@ import ( "github.com/minio/highwayhash" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) const ( diff --git a/p2p/pex/addrbook_test.go b/p2p/pex/addrbook_test.go index a9055799fca..f0b1b6893e7 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/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // FIXME These tests should not rely on .(*addrBook) assertions diff --git a/p2p/pex/errors.go b/p2p/pex/errors.go index e60166d060d..6887632f6a4 100644 --- a/p2p/pex/errors.go +++ b/p2p/pex/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) type ErrAddrBookNonRoutable struct { diff --git a/p2p/pex/file.go b/p2p/pex/file.go index 6f912bc7052..b62412add98 100644 --- a/p2p/pex/file.go +++ b/p2p/pex/file.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/tendermint/tendermint/libs/tempfile" + "github.com/KYVENetwork/cometbft/v034x/libs/tempfile" ) /* Loading & Saving */ diff --git a/p2p/pex/known_address.go b/p2p/pex/known_address.go index 33763c084cb..01ad995be13 100644 --- a/p2p/pex/known_address.go +++ b/p2p/pex/known_address.go @@ -3,7 +3,7 @@ package pex import ( "time" - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // knownAddress tracks information about a known network address diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index 5fc24bfca29..c4f3634e63a 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -8,13 +8,13 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/libs/cmap" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/libs/cmap" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) type Peer = p2p.Peer diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go index b39587ebda8..be5bc1f1e2e 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/mock" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/mock" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) var cfg *config.P2PConfig @@ -402,7 +402,7 @@ func TestPEXReactorDialsPeerUpToMaxAttemptsInSeedMode(t *testing.T) { // this should give it time to request addrs and for the seed // to call FlushStop, and allows us to test calling Stop concurrently // with FlushStop. Before a fix, this non-deterministically reproduced -// https://github.com/tendermint/tendermint/issues/3231. +// https://github.com/KYVENetwork/cometbft/v034x/issues/3231. func TestPEXReactorSeedModeFlushStop(t *testing.T) { N := 2 switches := make([]*p2p.Switch, N) diff --git a/p2p/switch.go b/p2p/switch.go index 60d26729b07..079945aef79 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -6,12 +6,12 @@ import ( "sync" "time" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cmap" + "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cmap" - "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p/conn" ) const ( @@ -409,7 +409,7 @@ func (sw *Switch) stopAndRemovePeer(peer Peer, reason interface{}) { // Removing a peer should go last to avoid a situation where a peer // reconnect to our node and the switch calls InitPeer before // RemovePeer is finished. - // https://github.com/tendermint/tendermint/issues/3338 + // https://github.com/KYVENetwork/cometbft/v034x/issues/3338 if sw.peers.Remove(peer) { sw.metrics.Peers.Add(float64(-1)) } else { diff --git a/p2p/switch_test.go b/p2p/switch_test.go index be9a9b234d4..eb7064fa9fc 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p/conn" - p2pproto "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + p2pproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) var cfg *config.P2PConfig diff --git a/p2p/test_util.go b/p2p/test_util.go index 32166043a1f..a1f5a1a2e37 100644 --- a/p2p/test_util.go +++ b/p2p/test_util.go @@ -5,14 +5,14 @@ import ( "net" "time" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - cmtrand "github.com/tendermint/tendermint/libs/rand" - - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) const testCh = 0x01 diff --git a/p2p/transport.go b/p2p/transport.go index 416c946942b..cce9a58b092 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -8,11 +8,11 @@ import ( "golang.org/x/net/netutil" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/libs/protoio" - "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) const ( @@ -297,7 +297,7 @@ func (mt *MultiplexTransport) acceptPeers() { // Connection upgrade and filtering should be asynchronous to avoid // Head-of-line blocking[0]. - // Reference: https://github.com/tendermint/tendermint/issues/2047 + // Reference: https://github.com/KYVENetwork/cometbft/v034x/issues/2047 // // [0] https://en.wikipedia.org/wiki/Head-of-line_blocking go func(c net.Conn) { diff --git a/p2p/transport_test.go b/p2p/transport_test.go index adaab399550..358b34863be 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/protoio" - "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) var defaultNodeName = "host_peer" diff --git a/p2p/trust/metric.go b/p2p/trust/metric.go index 7ea57676bf6..97e6374b0b5 100644 --- a/p2p/trust/metric.go +++ b/p2p/trust/metric.go @@ -4,8 +4,8 @@ import ( "math" "time" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) //--------------------------------------------------------------------------------------- diff --git a/p2p/trust/store.go b/p2p/trust/store.go index 7379e937f74..a6c06e2fc60 100644 --- a/p2p/trust/store.go +++ b/p2p/trust/store.go @@ -7,8 +7,8 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" ) const defaultStorePeriodicSaveInterval = 1 * time.Minute diff --git a/p2p/trust/store_test.go b/p2p/trust/store_test.go index d603e1d7410..9de0fc7695c 100644 --- a/p2p/trust/store_test.go +++ b/p2p/trust/store_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestTrustMetricStoreSaveLoad(t *testing.T) { diff --git a/p2p/types.go b/p2p/types.go index 7a741bd2957..1104b4f450d 100644 --- a/p2p/types.go +++ b/p2p/types.go @@ -1,9 +1,9 @@ package p2p import ( + "github.com/KYVENetwork/cometbft/v034x/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p/conn" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" ) type ChannelDescriptor = conn.ChannelDescriptor diff --git a/p2p/upnp/probe.go b/p2p/upnp/probe.go index 6e269c96a28..a986ca9d37b 100644 --- a/p2p/upnp/probe.go +++ b/p2p/upnp/probe.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) type Capabilities struct { diff --git a/privval/file.go b/privval/file.go index a6131024035..91428ae95f9 100644 --- a/privval/file.go +++ b/privval/file.go @@ -9,16 +9,16 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/protoio" - "github.com/tendermint/tendermint/libs/tempfile" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/libs/tempfile" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) // TODO: type ? diff --git a/privval/file_test.go b/privval/file_test.go index bc7bfed21f3..d5c10820715 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/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) func TestGenLoadValidator(t *testing.T) { @@ -131,11 +131,11 @@ func TestUnmarshalValidatorKey(t *testing.T) { serialized := fmt.Sprintf(`{ "address": "%s", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/PubKeyEd25519", "value": "%s" }, "priv_key": { - "type": "tendermint/PrivKeyEd25519", + "type": "cometbft/PrivKeyEd25519", "value": "%s" } }`, addr, pubB64, privB64) diff --git a/privval/msgs.go b/privval/msgs.go index bcfed629bdd..9afd7fc5557 100644 --- a/privval/msgs.go +++ b/privval/msgs.go @@ -5,7 +5,7 @@ import ( "github.com/gogo/protobuf/proto" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" ) // TODO: Add ChainIDRequest diff --git a/privval/msgs_test.go b/privval/msgs_test.go index edc7af9a1ae..9ad62715acc 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -8,14 +8,14 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/tmhash" - cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto" - privproto "github.com/tendermint/tendermint/proto/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cryptoproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + privproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/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 27eef644305..bf9d5ac7289 100644 --- a/privval/retry_signer_client.go +++ b/privval/retry_signer_client.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // RetrySignerClient wraps SignerClient adding retry for each operation (except diff --git a/privval/signer_client.go b/privval/signer_client.go index 68ce47a4b0d..a217078e5c4 100644 --- a/privval/signer_client.go +++ b/privval/signer_client.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // SignerClient implements PrivValidator. diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go index b94f78d6324..8d1b5500bbc 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/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cryptoproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) type signerTestCase struct { diff --git a/privval/signer_dialer_endpoint.go b/privval/signer_dialer_endpoint.go index 93d26b04392..72356188cf9 100644 --- a/privval/signer_dialer_endpoint.go +++ b/privval/signer_dialer_endpoint.go @@ -3,8 +3,8 @@ package privval import ( "time" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) const ( diff --git a/privval/signer_endpoint.go b/privval/signer_endpoint.go index c17e83ec2c1..30715cd1e13 100644 --- a/privval/signer_endpoint.go +++ b/privval/signer_endpoint.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/tendermint/tendermint/libs/protoio" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" ) const ( diff --git a/privval/signer_listener_endpoint.go b/privval/signer_listener_endpoint.go index 959d3ea0720..7812341f91e 100644 --- a/privval/signer_listener_endpoint.go +++ b/privval/signer_listener_endpoint.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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 afb889d5f9b..57cd2c87dc3 100644 --- a/privval/signer_listener_endpoint_test.go +++ b/privval/signer_listener_endpoint_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go index 56c0fcca17d..bc66f40103a 100644 --- a/privval/signer_requestHandler.go +++ b/privval/signer_requestHandler.go @@ -3,12 +3,12 @@ package privval import ( "fmt" - "github.com/tendermint/tendermint/crypto" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - cryptoproto "github.com/tendermint/tendermint/proto/tendermint/crypto" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + cryptoproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) func DefaultValidationRequestHandler( diff --git a/privval/signer_server.go b/privval/signer_server.go index ac242d44e4c..d3612957373 100644 --- a/privval/signer_server.go +++ b/privval/signer_server.go @@ -3,10 +3,10 @@ package privval import ( "io" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - privvalproto "github.com/tendermint/tendermint/proto/tendermint/privval" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/types" ) // ValidationRequestHandlerFunc handles different remoteSigner requests diff --git a/privval/socket_dialers.go b/privval/socket_dialers.go index 1c6ce5d76c7..805affa6e74 100644 --- a/privval/socket_dialers.go +++ b/privval/socket_dialers.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/tendermint/tendermint/crypto" - cmtnet "github.com/tendermint/tendermint/libs/net" - p2pconn "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + p2pconn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) // Socket errors. diff --git a/privval/socket_dialers_test.go b/privval/socket_dialers_test.go index 32c07c59118..d4f36f92627 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/tendermint/tendermint/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" ) func getDialerTestCases(t *testing.T) []dialerTestCase { diff --git a/privval/socket_listeners.go b/privval/socket_listeners.go index 4e318390a7d..1675a735f52 100644 --- a/privval/socket_listeners.go +++ b/privval/socket_listeners.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/tendermint/tendermint/crypto/ed25519" - p2pconn "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + p2pconn "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) const ( @@ -140,7 +140,7 @@ func (ln *UnixListener) Accept() (net.Conn, error) { conn := newTimeoutConn(tc, ln.timeoutReadWrite) // TODO: wrap in something that authenticates - // with a MAC - https://github.com/tendermint/tendermint/issues/3099 + // with a MAC - https://github.com/KYVENetwork/cometbft/v034x/issues/3099 return conn, nil } diff --git a/privval/socket_listeners_test.go b/privval/socket_listeners_test.go index e9659d295df..d9c5507df67 100644 --- a/privval/socket_listeners_test.go +++ b/privval/socket_listeners_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" ) //------------------------------------------- diff --git a/privval/utils.go b/privval/utils.go index b435ddc3966..9a0d21ff854 100644 --- a/privval/utils.go +++ b/privval/utils.go @@ -5,9 +5,9 @@ import ( "fmt" "net" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" ) // IsConnTimeout returns a boolean indicating whether the error is known to diff --git a/proto/buf.yaml b/proto/buf.yaml index 90988439bb7..90c192ad13d 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,5 +1,5 @@ version: v1 -name: buf.build/tendermint/tendermint +name: buf.build/cometbft/cometbft deps: - buf.build/gogo/protobuf breaking: diff --git a/proto/tendermint/abci/types.proto b/proto/cometbft/v034x/abci/types.proto similarity index 94% rename from proto/tendermint/abci/types.proto rename to proto/cometbft/v034x/abci/types.proto index 44f86112938..0c9f791f012 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/cometbft/v034x/abci/types.proto @@ -1,14 +1,14 @@ syntax = "proto3"; -package tendermint.abci; +package cometbft.v034x.abci; -option go_package = "github.com/tendermint/tendermint/abci/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/abci/types"; // For more information on gogo.proto, see: // https://github.com/gogo/protobuf/blob/master/extensions.md -import "tendermint/crypto/proof.proto"; -import "tendermint/types/types.proto"; -import "tendermint/crypto/keys.proto"; -import "tendermint/types/params.proto"; +import "cometbft/v034x/crypto/proof.proto"; +import "cometbft/v034x/types/types.proto"; +import "cometbft/v034x/crypto/keys.proto"; +import "cometbft/v034x/types/params.proto"; import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; @@ -76,7 +76,7 @@ message RequestQuery { message RequestBeginBlock { bytes hash = 1; - tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; + cometbft.v034x.types.Header header = 2 [(gogoproto.nullable) = false]; LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; } @@ -191,7 +191,7 @@ message ResponseQuery { int64 index = 5; bytes key = 6; bytes value = 7; - tendermint.crypto.ProofOps proof_ops = 8; + cometbft.v034x.crypto.ProofOps proof_ops = 8; int64 height = 9; string codespace = 10; } @@ -289,9 +289,9 @@ message ResponseApplySnapshotChunk { // that can be adjusted by the abci app message ConsensusParams { BlockParams block = 1; - tendermint.types.EvidenceParams evidence = 2; - tendermint.types.ValidatorParams validator = 3; - tendermint.types.VersionParams version = 4; + cometbft.v034x.types.EvidenceParams evidence = 2; + cometbft.v034x.types.ValidatorParams validator = 3; + cometbft.v034x.types.VersionParams version = 4; } // BlockParams contains limits on the block size. @@ -347,7 +347,7 @@ message Validator { // ValidatorUpdate message ValidatorUpdate { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + cometbft.v034x.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; int64 power = 2; } @@ -374,7 +374,7 @@ message Evidence { [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // Total voting power of the validator set in case the ABCI application does // not store historical validators. - // https://github.com/tendermint/tendermint/issues/4581 + // https://github.com/KYVENetwork/cometbft/v034x/issues/4581 int64 total_voting_power = 5; } diff --git a/proto/tendermint/blockchain/message.go b/proto/cometbft/v034x/blockchain/message.go similarity index 97% rename from proto/tendermint/blockchain/message.go rename to proto/cometbft/v034x/blockchain/message.go index 1d11e41764b..70cd045f62b 100644 --- a/proto/tendermint/blockchain/message.go +++ b/proto/cometbft/v034x/blockchain/message.go @@ -3,8 +3,8 @@ package blockchain import ( "fmt" + "github.com/KYVENetwork/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p" ) var _ p2p.Wrapper = &StatusRequest{} diff --git a/proto/tendermint/blockchain/types.pb.go b/proto/cometbft/v034x/blockchain/types.pb.go similarity index 90% rename from proto/tendermint/blockchain/types.pb.go rename to proto/cometbft/v034x/blockchain/types.pb.go index bc160b23029..698b26de45b 100644 --- a/proto/tendermint/blockchain/types.pb.go +++ b/proto/cometbft/v034x/blockchain/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/blockchain/types.proto +// source: cometbft/v034x/blockchain/types.proto package blockchain import ( fmt "fmt" + types "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" proto "github.com/gogo/protobuf/proto" - types "github.com/tendermint/tendermint/proto/tendermint/types" 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_2927480384e78499, []int{0} + return fileDescriptor_cf822aff78d30b08, []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_2927480384e78499, []int{1} + return fileDescriptor_cf822aff78d30b08, []int{1} } func (m *NoBlockResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,7 +122,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_2927480384e78499, []int{2} + return fileDescriptor_cf822aff78d30b08, []int{2} } func (m *BlockResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -166,7 +166,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_2927480384e78499, []int{3} + return fileDescriptor_cf822aff78d30b08, []int{3} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,7 +205,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_2927480384e78499, []int{4} + return fileDescriptor_cf822aff78d30b08, []int{4} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -262,7 +262,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_2927480384e78499, []int{5} + return fileDescriptor_cf822aff78d30b08, []int{5} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -373,42 +373,45 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*BlockRequest)(nil), "tendermint.blockchain.BlockRequest") - proto.RegisterType((*NoBlockResponse)(nil), "tendermint.blockchain.NoBlockResponse") - proto.RegisterType((*BlockResponse)(nil), "tendermint.blockchain.BlockResponse") - proto.RegisterType((*StatusRequest)(nil), "tendermint.blockchain.StatusRequest") - proto.RegisterType((*StatusResponse)(nil), "tendermint.blockchain.StatusResponse") - proto.RegisterType((*Message)(nil), "tendermint.blockchain.Message") -} - -func init() { proto.RegisterFile("tendermint/blockchain/types.proto", fileDescriptor_2927480384e78499) } - -var fileDescriptor_2927480384e78499 = []byte{ - // 370 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xc1, 0x4e, 0xfa, 0x40, - 0x10, 0xc6, 0xdb, 0x7f, 0x81, 0x7f, 0x32, 0x50, 0x1a, 0x9b, 0xa8, 0xc4, 0x98, 0x46, 0xab, 0x12, - 0x3d, 0xd8, 0x26, 0x78, 0x25, 0x1e, 0x38, 0x11, 0x13, 0x8c, 0xa9, 0xc6, 0x83, 0x17, 0xd2, 0xe2, - 0x86, 0x36, 0x4a, 0x17, 0xd9, 0xed, 0xc1, 0xb7, 0xf0, 0x19, 0x7c, 0x1a, 0x8f, 0x1c, 0x3d, 0x1a, - 0x78, 0x11, 0xc3, 0x6c, 0x29, 0x4b, 0x03, 0xf5, 0xb6, 0x3b, 0xfd, 0xe6, 0x37, 0xdf, 0x7e, 0x99, - 0xc2, 0x31, 0x27, 0xf1, 0x33, 0x99, 0x8c, 0xa2, 0x98, 0xbb, 0xc1, 0x2b, 0x1d, 0xbc, 0x0c, 0x42, - 0x3f, 0x8a, 0x5d, 0xfe, 0x3e, 0x26, 0xcc, 0x19, 0x4f, 0x28, 0xa7, 0xe6, 0xee, 0x4a, 0xe2, 0xac, - 0x24, 0x07, 0x87, 0x52, 0x27, 0xca, 0x45, 0xbf, 0x68, 0xb2, 0x9b, 0x50, 0xeb, 0x2c, 0xae, 0x1e, - 0x79, 0x4b, 0x08, 0xe3, 0xe6, 0x1e, 0x54, 0x42, 0x12, 0x0d, 0x43, 0xde, 0x50, 0x8f, 0xd4, 0x73, - 0xcd, 0x4b, 0x6f, 0xf6, 0x05, 0x18, 0xb7, 0x34, 0x55, 0xb2, 0x31, 0x8d, 0x19, 0xd9, 0x2a, 0xbd, - 0x06, 0x7d, 0x5d, 0x78, 0x09, 0x65, 0x1c, 0x89, 0xba, 0x6a, 0x6b, 0xdf, 0x91, 0x8c, 0x8a, 0x07, - 0x08, 0xbd, 0x50, 0xd9, 0x06, 0xe8, 0xf7, 0xdc, 0xe7, 0x09, 0x4b, 0x3d, 0xd9, 0x6d, 0xa8, 0x2f, - 0x0b, 0xc5, 0xa3, 0x4d, 0x13, 0x4a, 0x81, 0xcf, 0x48, 0xe3, 0x1f, 0x56, 0xf1, 0x6c, 0x7f, 0x6a, - 0xf0, 0xbf, 0x47, 0x18, 0xf3, 0x87, 0xc4, 0xbc, 0x01, 0x1d, 0x67, 0xf4, 0x27, 0x02, 0x9d, 0x3a, - 0x3a, 0x71, 0x36, 0x46, 0xe7, 0xc8, 0xc9, 0x74, 0x15, 0xaf, 0x16, 0xc8, 0x49, 0x3d, 0xc0, 0x4e, - 0x4c, 0xfb, 0x4b, 0x9c, 0x30, 0x86, 0x83, 0xab, 0xad, 0xe6, 0x16, 0x5e, 0x2e, 0xc1, 0xae, 0xe2, - 0x19, 0x71, 0x2e, 0xd4, 0x1e, 0xd4, 0x73, 0x48, 0x0d, 0x91, 0xa7, 0xc5, 0x16, 0x33, 0xa0, 0x1e, - 0xe4, 0x71, 0x0c, 0xa3, 0xcb, 0x5e, 0x5c, 0x2a, 0xc4, 0xad, 0x05, 0xbf, 0xc0, 0x31, 0xb9, 0x60, - 0xde, 0x81, 0x91, 0xe1, 0x52, 0x7b, 0x65, 0xe4, 0x9d, 0xfd, 0xc1, 0xcb, 0xfc, 0xd5, 0xd9, 0x5a, - 0xa5, 0x53, 0x06, 0x8d, 0x25, 0xa3, 0xce, 0xe3, 0xd7, 0xcc, 0x52, 0xa7, 0x33, 0x4b, 0xfd, 0x99, - 0x59, 0xea, 0xc7, 0xdc, 0x52, 0xa6, 0x73, 0x4b, 0xf9, 0x9e, 0x5b, 0xca, 0x53, 0x7b, 0x18, 0xf1, - 0x30, 0x09, 0x9c, 0x01, 0x1d, 0xb9, 0xf2, 0x26, 0xaf, 0x8e, 0xb8, 0xc8, 0xee, 0xc6, 0xff, 0x23, - 0xa8, 0xe0, 0xc7, 0xab, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x59, 0x07, 0xbd, 0x3f, 0x03, - 0x00, 0x00, + proto.RegisterType((*BlockRequest)(nil), "cometbft.v034x.blockchain.BlockRequest") + proto.RegisterType((*NoBlockResponse)(nil), "cometbft.v034x.blockchain.NoBlockResponse") + proto.RegisterType((*BlockResponse)(nil), "cometbft.v034x.blockchain.BlockResponse") + proto.RegisterType((*StatusRequest)(nil), "cometbft.v034x.blockchain.StatusRequest") + proto.RegisterType((*StatusResponse)(nil), "cometbft.v034x.blockchain.StatusResponse") + proto.RegisterType((*Message)(nil), "cometbft.v034x.blockchain.Message") +} + +func init() { + proto.RegisterFile("cometbft/v034x/blockchain/types.proto", fileDescriptor_cf822aff78d30b08) +} + +var fileDescriptor_cf822aff78d30b08 = []byte{ + // 387 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6a, 0xea, 0x40, + 0x18, 0xc5, 0x93, 0x1b, 0xf5, 0xc2, 0xa7, 0x31, 0xdc, 0x2c, 0x2e, 0xde, 0x5b, 0x08, 0x12, 0x68, + 0xab, 0x5d, 0x24, 0xad, 0x76, 0x59, 0x28, 0x04, 0x0a, 0x42, 0xa9, 0xd0, 0xb4, 0x94, 0xda, 0x8d, + 0x64, 0x64, 0x6a, 0xc4, 0x9a, 0xb1, 0xce, 0xa4, 0x7f, 0xde, 0xa2, 0x4f, 0xd3, 0x67, 0xe8, 0xd2, + 0x65, 0x97, 0x45, 0x5f, 0xa4, 0x38, 0x13, 0xa3, 0x0e, 0xa8, 0xdd, 0x39, 0x9f, 0xe7, 0xfb, 0x9d, + 0x33, 0x27, 0x03, 0xbb, 0x1d, 0x32, 0xc0, 0x0c, 0xdd, 0x33, 0xf7, 0xe9, 0xb0, 0x7e, 0xfc, 0xe2, + 0xa2, 0x07, 0xd2, 0xe9, 0x77, 0xc2, 0xa0, 0x17, 0xb9, 0xec, 0x75, 0x88, 0xa9, 0x33, 0x1c, 0x11, + 0x46, 0xcc, 0x7f, 0x73, 0x99, 0xc3, 0x65, 0xce, 0x42, 0xf6, 0xbf, 0x2c, 0x11, 0xf8, 0x9a, 0xe0, + 0x88, 0x65, 0x7b, 0x0f, 0x0a, 0xde, 0xec, 0xe8, 0xe3, 0xc7, 0x18, 0x53, 0x66, 0xfe, 0x85, 0x5c, + 0x88, 0x7b, 0xdd, 0x90, 0x95, 0xd4, 0xb2, 0x5a, 0xd1, 0xfc, 0xe4, 0x64, 0x57, 0xc1, 0x68, 0x92, + 0x44, 0x49, 0x87, 0x24, 0xa2, 0x78, 0xad, 0xd4, 0x03, 0x7d, 0x55, 0x78, 0x04, 0x59, 0x6e, 0xc9, + 0x75, 0xf9, 0xda, 0x8e, 0x23, 0x05, 0x16, 0x97, 0x11, 0x3b, 0x42, 0x69, 0x1b, 0xa0, 0x5f, 0xb1, + 0x80, 0xc5, 0x34, 0xc9, 0x65, 0x9f, 0x40, 0x71, 0x3e, 0xd8, 0x6c, 0x6f, 0x9a, 0x90, 0x41, 0x01, + 0xc5, 0xa5, 0x5f, 0x7c, 0xca, 0x7f, 0xdb, 0xef, 0x1a, 0xfc, 0xbe, 0xc0, 0x94, 0x06, 0x5d, 0x6c, + 0x36, 0x41, 0xe7, 0x1e, 0xed, 0x91, 0x40, 0x27, 0xa9, 0xf6, 0x9d, 0xb5, 0x35, 0x3a, 0xcb, 0x0d, + 0x35, 0x14, 0xbf, 0x80, 0x96, 0x1b, 0xbb, 0x85, 0x3f, 0x11, 0x69, 0xcf, 0x91, 0x22, 0x1c, 0x37, + 0xcf, 0xd7, 0x0e, 0x36, 0x30, 0xa5, 0x36, 0x1b, 0x8a, 0x6f, 0x44, 0x52, 0xc1, 0x97, 0x50, 0x94, + 0xb0, 0x1a, 0xc7, 0x56, 0xb6, 0x47, 0x4d, 0xa1, 0x3a, 0x92, 0x91, 0x94, 0xd7, 0x98, 0xde, 0x3e, + 0xb3, 0x15, 0xb9, 0xf2, 0x21, 0x66, 0x48, 0xba, 0x3c, 0x30, 0xaf, 0xc1, 0x48, 0x91, 0x49, 0xcc, + 0x2c, 0x67, 0x56, 0x7f, 0xc0, 0x4c, 0x73, 0x16, 0xe9, 0xca, 0xc4, 0xcb, 0x82, 0x46, 0xe3, 0x81, + 0xd7, 0xfa, 0x98, 0x58, 0xea, 0x78, 0x62, 0xa9, 0x5f, 0x13, 0x4b, 0x7d, 0x9b, 0x5a, 0xca, 0x78, + 0x6a, 0x29, 0x9f, 0x53, 0x4b, 0xb9, 0x3b, 0xed, 0xf6, 0x58, 0x18, 0xa3, 0x99, 0x87, 0x7b, 0xde, + 0xba, 0x39, 0x6b, 0x62, 0xf6, 0x4c, 0x46, 0x7d, 0x57, 0x7a, 0xf1, 0xfc, 0x95, 0x2f, 0x86, 0x8b, + 0x08, 0x28, 0xc7, 0xff, 0xaa, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x05, 0x9c, 0x76, 0x3b, 0x66, + 0x03, 0x00, 0x00, } func (m *BlockRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/blockchain/types.proto b/proto/cometbft/v034x/blockchain/types.proto similarity index 79% rename from proto/tendermint/blockchain/types.proto rename to proto/cometbft/v034x/blockchain/types.proto index f5c143cf5b0..da8c7ac08eb 100644 --- a/proto/tendermint/blockchain/types.proto +++ b/proto/cometbft/v034x/blockchain/types.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package tendermint.blockchain; +package cometbft.v034x.blockchain; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/blockchain"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/blockchain"; -import "tendermint/types/block.proto"; +import "cometbft/v034x/types/block.proto"; // BlockRequest requests a block for a specific height message BlockRequest { @@ -17,7 +17,7 @@ message NoBlockResponse { // BlockResponse returns block to the requested message BlockResponse { - tendermint.types.Block block = 1; + cometbft.v034x.types.Block block = 1; } // StatusRequest requests the status of a peer. diff --git a/proto/tendermint/consensus/message.go b/proto/cometbft/v034x/consensus/message.go similarity index 98% rename from proto/tendermint/consensus/message.go rename to proto/cometbft/v034x/consensus/message.go index 51ac3b48f50..d97e8602d8e 100644 --- a/proto/tendermint/consensus/message.go +++ b/proto/cometbft/v034x/consensus/message.go @@ -3,8 +3,8 @@ package consensus import ( "fmt" + "github.com/KYVENetwork/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p" ) var _ p2p.Wrapper = &VoteSetBits{} diff --git a/proto/tendermint/consensus/types.pb.go b/proto/cometbft/v034x/consensus/types.pb.go similarity index 91% rename from proto/tendermint/consensus/types.pb.go rename to proto/cometbft/v034x/consensus/types.pb.go index 98550a3b263..222fb53a231 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/cometbft/v034x/consensus/types.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/consensus/types.proto +// source: cometbft/v034x/consensus/types.proto package consensus import ( fmt "fmt" + bits "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/libs/bits" + types "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - bits "github.com/tendermint/tendermint/proto/tendermint/libs/bits" - types "github.com/tendermint/tendermint/proto/tendermint/types" 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_b240a75ca17d6847, []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_b240a75ca17d6847, []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_b240a75ca17d6847, []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_b240a75ca17d6847, []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_b240a75ca17d6847, []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_b240a75ca17d6847, []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.v034x.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_b240a75ca17d6847, []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.v034x.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_b240a75ca17d6847, []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.v034x.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_b240a75ca17d6847, []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_b240a75ca17d6847, []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{ - // 853 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0xb7, 0x59, 0x67, 0x93, 0x7d, 0xde, 0xec, 0xc2, 0x68, 0x5b, 0x85, 0x00, 0x49, 0x30, 0x97, - 0x15, 0x42, 0x0e, 0xca, 0x1e, 0x90, 0x0a, 0x12, 0x60, 0xfe, 0xd4, 0xad, 0x9a, 0x36, 0x72, 0x4a, - 0x85, 0xb8, 0x58, 0x4e, 0x3c, 0x4a, 0x86, 0xc6, 0x1e, 0xcb, 0x33, 0xc9, 0xb2, 0x57, 0x3e, 0x01, - 0x1f, 0x80, 0xaf, 0x81, 0xc4, 0x47, 0xe8, 0xb1, 0x47, 0x4e, 0x15, 0xca, 0x7e, 0x04, 0x04, 0x67, - 0x34, 0xe3, 0x49, 0x3c, 0xa1, 0xde, 0x85, 0xbd, 0x20, 0xf5, 0x36, 0xe3, 0xf7, 0xde, 0x6f, 0xde, - 0xfc, 0xde, 0x7b, 0x3f, 0x0f, 0xf4, 0x38, 0x4e, 0x63, 0x9c, 0x27, 0x24, 0xe5, 0xfd, 0x29, 0x4d, - 0x19, 0x4e, 0xd9, 0x92, 0xf5, 0xf9, 0x45, 0x86, 0x99, 0x9b, 0xe5, 0x94, 0x53, 0x74, 0x52, 0x7a, - 0xb8, 0x5b, 0x8f, 0xf6, 0xc9, 0x8c, 0xce, 0xa8, 0x74, 0xe8, 0x8b, 0x55, 0xe1, 0xdb, 0x7e, 0x5b, - 0x43, 0x93, 0x18, 0x3a, 0x52, 0x5b, 0x3f, 0x6b, 0x41, 0x26, 0xac, 0x3f, 0x21, 0x7c, 0xc7, 0xc3, - 0xf9, 0xc5, 0x84, 0xc3, 0x87, 0xf8, 0x3c, 0xa0, 0xcb, 0x34, 0x1e, 0x73, 0x9c, 0xa1, 0xdb, 0xb0, - 0x3f, 0xc7, 0x64, 0x36, 0xe7, 0x2d, 0xb3, 0x67, 0x9e, 0xee, 0x05, 0x6a, 0x87, 0x4e, 0xa0, 0x96, - 0x0b, 0xa7, 0xd6, 0x6b, 0x3d, 0xf3, 0xb4, 0x16, 0x14, 0x1b, 0x84, 0xc0, 0x62, 0x1c, 0x67, 0xad, - 0xbd, 0x9e, 0x79, 0xda, 0x0c, 0xe4, 0x1a, 0x7d, 0x04, 0x2d, 0x86, 0xa7, 0x34, 0x8d, 0x59, 0xc8, - 0x48, 0x3a, 0xc5, 0x21, 0xe3, 0x51, 0xce, 0x43, 0x4e, 0x12, 0xdc, 0xb2, 0x24, 0xe6, 0x2d, 0x65, - 0x1f, 0x0b, 0xf3, 0x58, 0x58, 0x1f, 0x93, 0x04, 0xa3, 0xf7, 0xe1, 0x8d, 0x45, 0xc4, 0x78, 0x38, - 0xa5, 0x49, 0x42, 0x78, 0x58, 0x1c, 0x57, 0x93, 0xc7, 0x1d, 0x0b, 0xc3, 0x17, 0xf2, 0xbb, 0x4c, - 0xd5, 0xf9, 0xd3, 0x84, 0xe6, 0x43, 0x7c, 0xfe, 0x24, 0x5a, 0x90, 0xd8, 0x5b, 0xd0, 0xe9, 0xd3, - 0x1b, 0x26, 0xfe, 0x2d, 0xdc, 0x9a, 0x88, 0xb0, 0x30, 0x13, 0xb9, 0x31, 0xcc, 0xc3, 0x39, 0x8e, - 0x62, 0x9c, 0xcb, 0x9b, 0xd8, 0x83, 0xae, 0xab, 0xd5, 0xa0, 0xe0, 0x6b, 0x14, 0xe5, 0x7c, 0x8c, - 0xb9, 0x2f, 0xdd, 0x3c, 0xeb, 0xd9, 0x8b, 0xae, 0x11, 0x20, 0x89, 0xb1, 0x63, 0x41, 0x9f, 0x82, - 0x5d, 0x22, 0x33, 0x79, 0x63, 0x7b, 0xd0, 0xd1, 0xf1, 0x44, 0x25, 0x5c, 0x51, 0x09, 0xd7, 0x23, - 0xfc, 0xf3, 0x3c, 0x8f, 0x2e, 0x02, 0xd8, 0x02, 0x31, 0xf4, 0x16, 0x1c, 0x10, 0xa6, 0x48, 0x90, - 0xd7, 0x6f, 0x04, 0x0d, 0xc2, 0x8a, 0xcb, 0x3b, 0x3e, 0x34, 0x46, 0x39, 0xcd, 0x28, 0x8b, 0x16, - 0xe8, 0x13, 0x68, 0x64, 0x6a, 0x2d, 0xef, 0x6c, 0x0f, 0xda, 0x15, 0x69, 0x2b, 0x0f, 0x95, 0xf1, - 0x36, 0xc2, 0xf9, 0xd9, 0x04, 0x7b, 0x63, 0x1c, 0x3d, 0x7a, 0x70, 0x25, 0x7f, 0x1f, 0x00, 0xda, - 0xc4, 0x84, 0x19, 0x5d, 0x84, 0x3a, 0x99, 0xaf, 0x6f, 0x2c, 0x23, 0xba, 0x90, 0x75, 0x41, 0x77, - 0xe1, 0x50, 0xf7, 0x56, 0x74, 0xfe, 0xcb, 0xf5, 0x55, 0x6e, 0xb6, 0x86, 0xe6, 0x3c, 0x85, 0x03, - 0x6f, 0xc3, 0xc9, 0x0d, 0x6b, 0xfb, 0x21, 0x58, 0x82, 0x7b, 0x75, 0xf6, 0xed, 0xea, 0x52, 0xaa, - 0x33, 0xa5, 0xa7, 0x33, 0x00, 0xeb, 0x09, 0xe5, 0xa2, 0x03, 0xad, 0x15, 0xe5, 0x58, 0xb1, 0x59, - 0x11, 0x29, 0xbc, 0x02, 0xe9, 0xe3, 0xfc, 0x68, 0x42, 0xdd, 0x8f, 0x98, 0x8c, 0xbb, 0x59, 0x7e, - 0x67, 0x60, 0x09, 0x34, 0x99, 0xdf, 0x51, 0x55, 0xab, 0x8d, 0xc9, 0x2c, 0xc5, 0xf1, 0x90, 0xcd, - 0x1e, 0x5f, 0x64, 0x38, 0x90, 0xce, 0x02, 0x8a, 0xa4, 0x31, 0xfe, 0x41, 0x36, 0x54, 0x2d, 0x28, - 0x36, 0xce, 0xaf, 0x26, 0x1c, 0x8a, 0x0c, 0xc6, 0x98, 0x0f, 0xa3, 0xef, 0x07, 0x67, 0xff, 0x47, - 0x26, 0x5f, 0x41, 0xa3, 0x68, 0x70, 0x12, 0xab, 0xee, 0x7e, 0xf3, 0xe5, 0x40, 0x59, 0xbb, 0x7b, - 0x5f, 0x7a, 0xc7, 0x82, 0xe5, 0xf5, 0x8b, 0x6e, 0x5d, 0x7d, 0x08, 0xea, 0x32, 0xf6, 0x5e, 0xec, - 0xfc, 0x61, 0x82, 0xad, 0x52, 0xf7, 0x08, 0x67, 0xaf, 0x4e, 0xe6, 0xe8, 0x0e, 0xd4, 0x44, 0x07, - 0x30, 0x39, 0x9c, 0xff, 0xb5, 0xb9, 0x8b, 0x10, 0xe7, 0x2f, 0x0b, 0xea, 0x43, 0xcc, 0x58, 0x34, - 0xc3, 0xe8, 0x3e, 0x1c, 0xa5, 0xf8, 0xbc, 0x18, 0xa8, 0x50, 0xca, 0x68, 0xd1, 0x77, 0x8e, 0x5b, - 0xf5, 0x03, 0x70, 0x75, 0x99, 0xf6, 0x8d, 0xe0, 0x30, 0xd5, 0x65, 0x7b, 0x08, 0xc7, 0x02, 0x6b, - 0x25, 0xf4, 0x30, 0x94, 0x89, 0x4a, 0xbe, 0xec, 0xc1, 0x7b, 0x57, 0x82, 0x95, 0xda, 0xe9, 0x1b, - 0x41, 0x33, 0xdd, 0x11, 0x53, 0x5d, 0x5a, 0x2a, 0x46, 0xb8, 0xc4, 0xd9, 0x28, 0x88, 0xaf, 0x49, - 0x0b, 0xfa, 0xfa, 0x1f, 0x22, 0x50, 0x70, 0xfd, 0xee, 0xf5, 0x08, 0xa3, 0x47, 0x0f, 0xfc, 0x5d, - 0x0d, 0x40, 0x9f, 0x01, 0x94, 0x52, 0xaa, 0xd8, 0xee, 0x56, 0xa3, 0x6c, 0xb5, 0xc2, 0x37, 0x82, - 0x83, 0xad, 0x98, 0x0a, 0x29, 0x90, 0x03, 0xbd, 0xff, 0xb2, 0x3c, 0x96, 0xb1, 0xa2, 0x0b, 0x7d, - 0xa3, 0x18, 0x6b, 0x74, 0x07, 0x1a, 0xf3, 0x88, 0x85, 0x32, 0xaa, 0x2e, 0xa3, 0xde, 0xa9, 0x8e, - 0x52, 0xb3, 0xef, 0x1b, 0x41, 0x7d, 0xae, 0x64, 0xe0, 0x3e, 0x1c, 0x89, 0x38, 0xf9, 0x3b, 0x49, - 0xc4, 0x38, 0xb6, 0x1a, 0xd7, 0x15, 0x54, 0x1f, 0x5c, 0x51, 0xd0, 0x95, 0x3e, 0xc8, 0x77, 0xa1, - 0xb9, 0xc5, 0x12, 0xfd, 0xd4, 0x3a, 0xb8, 0x8e, 0x44, 0x6d, 0x90, 0x04, 0x89, 0xab, 0x72, 0xeb, - 0xd5, 0x60, 0x8f, 0x2d, 0x13, 0xef, 0x9b, 0x67, 0xeb, 0x8e, 0xf9, 0x7c, 0xdd, 0x31, 0x7f, 0x5f, - 0x77, 0xcc, 0x9f, 0x2e, 0x3b, 0xc6, 0xf3, 0xcb, 0x8e, 0xf1, 0xdb, 0x65, 0xc7, 0xf8, 0xee, 0xe3, - 0x19, 0xe1, 0xf3, 0xe5, 0xc4, 0x9d, 0xd2, 0xa4, 0xaf, 0xbf, 0x26, 0xca, 0x65, 0xf1, 0xea, 0xa8, - 0x7a, 0xb7, 0x4c, 0xf6, 0xa5, 0xed, 0xec, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x5c, 0x91, - 0x04, 0xd6, 0x08, 0x00, 0x00, + proto.RegisterType((*NewRoundStep)(nil), "cometbft.v034x.consensus.NewRoundStep") + proto.RegisterType((*NewValidBlock)(nil), "cometbft.v034x.consensus.NewValidBlock") + proto.RegisterType((*Proposal)(nil), "cometbft.v034x.consensus.Proposal") + proto.RegisterType((*ProposalPOL)(nil), "cometbft.v034x.consensus.ProposalPOL") + proto.RegisterType((*BlockPart)(nil), "cometbft.v034x.consensus.BlockPart") + proto.RegisterType((*Vote)(nil), "cometbft.v034x.consensus.Vote") + proto.RegisterType((*HasVote)(nil), "cometbft.v034x.consensus.HasVote") + proto.RegisterType((*VoteSetMaj23)(nil), "cometbft.v034x.consensus.VoteSetMaj23") + proto.RegisterType((*VoteSetBits)(nil), "cometbft.v034x.consensus.VoteSetBits") + proto.RegisterType((*Message)(nil), "cometbft.v034x.consensus.Message") +} + +func init() { + proto.RegisterFile("cometbft/v034x/consensus/types.proto", fileDescriptor_b240a75ca17d6847) +} + +var fileDescriptor_b240a75ca17d6847 = []byte{ + // 870 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0xb6, 0x69, 0xd2, 0xa4, 0xcf, 0xfd, 0x01, 0xa3, 0x5d, 0x64, 0x15, 0x91, 0x2d, 0x5e, 0x7e, + 0x54, 0x08, 0x39, 0x28, 0x5d, 0xb1, 0xb7, 0x0a, 0xbc, 0x8b, 0xe4, 0xd2, 0x36, 0x1b, 0x9c, 0x55, + 0x05, 0x08, 0xc9, 0x72, 0xe2, 0x21, 0x19, 0x36, 0xf1, 0x58, 0x9e, 0x69, 0xba, 0xfd, 0x07, 0x38, + 0x73, 0xe6, 0xc4, 0x3f, 0xc1, 0x9d, 0xe3, 0x1e, 0xf7, 0xc8, 0x69, 0x85, 0xda, 0xbf, 0x03, 0x81, + 0xe6, 0x79, 0xe2, 0xb8, 0x51, 0x4d, 0xe9, 0x05, 0x69, 0x6f, 0x1e, 0xbf, 0xf7, 0x7d, 0xf3, 0xe6, + 0x7b, 0x6f, 0x3e, 0x1b, 0xde, 0x1f, 0xf2, 0x29, 0x95, 0x83, 0x1f, 0x64, 0x7b, 0xf6, 0xe9, 0xde, + 0x83, 0xe7, 0xed, 0x21, 0x4f, 0x04, 0x4d, 0xc4, 0xa9, 0x68, 0xcb, 0xf3, 0x94, 0x0a, 0x37, 0xcd, + 0xb8, 0xe4, 0xc4, 0x9e, 0x67, 0xb9, 0x98, 0xe5, 0x16, 0x59, 0xdb, 0x77, 0x46, 0x7c, 0xc4, 0x31, + 0xa9, 0xad, 0x9e, 0xf2, 0xfc, 0xed, 0x9d, 0x25, 0x56, 0xe4, 0x2a, 0x33, 0x6e, 0x2f, 0xef, 0x3b, + 0x61, 0x03, 0xd1, 0x1e, 0x30, 0x79, 0x25, 0xcb, 0xf9, 0xcd, 0x84, 0xf5, 0x2e, 0x3d, 0x0b, 0xf8, + 0x69, 0x12, 0xf7, 0x25, 0x4d, 0xc9, 0xdb, 0xb0, 0x3a, 0xa6, 0x6c, 0x34, 0x96, 0xb6, 0xb9, 0x63, + 0xee, 0xae, 0x04, 0x7a, 0x45, 0xee, 0x40, 0x3d, 0x53, 0x49, 0xf6, 0x1b, 0x3b, 0xe6, 0x6e, 0x3d, + 0xc8, 0x17, 0x84, 0x40, 0x4d, 0x48, 0x9a, 0xda, 0x2b, 0x3b, 0xe6, 0xee, 0x46, 0x80, 0xcf, 0xe4, + 0x21, 0xd8, 0x82, 0x0e, 0x79, 0x12, 0x8b, 0x50, 0xb0, 0x64, 0x48, 0x43, 0x21, 0xa3, 0x4c, 0x86, + 0x92, 0x4d, 0xa9, 0x5d, 0x43, 0xce, 0xbb, 0x3a, 0xde, 0x57, 0xe1, 0xbe, 0x8a, 0x3e, 0x65, 0x53, + 0x4a, 0x3e, 0x86, 0xb7, 0x26, 0x91, 0x90, 0xe1, 0x90, 0x4f, 0xa7, 0x4c, 0x86, 0xf9, 0x76, 0x75, + 0xdc, 0x6e, 0x4b, 0x05, 0x1e, 0xe1, 0x7b, 0x2c, 0xd5, 0xf9, 0xcb, 0x84, 0x8d, 0x2e, 0x3d, 0x3b, + 0x89, 0x26, 0x2c, 0xf6, 0x26, 0x7c, 0xf8, 0xec, 0x96, 0x85, 0x7f, 0x0f, 0x77, 0x07, 0x0a, 0x16, + 0xa6, 0xaa, 0x36, 0x41, 0x65, 0x38, 0xa6, 0x51, 0x4c, 0x33, 0x3c, 0x89, 0xd5, 0xb9, 0xef, 0x2e, + 0xf5, 0x23, 0xd7, 0xac, 0x17, 0x65, 0xb2, 0x4f, 0xa5, 0x8f, 0xa9, 0x5e, 0xed, 0xc5, 0xab, 0x7b, + 0x46, 0x40, 0x90, 0xe7, 0x4a, 0x84, 0x3c, 0x02, 0x6b, 0xc1, 0x2e, 0xf0, 0xd4, 0x56, 0xc7, 0x59, + 0xe6, 0x54, 0x1d, 0x71, 0x55, 0x47, 0x5c, 0x8f, 0xc9, 0x2f, 0xb2, 0x2c, 0x3a, 0x0f, 0xa0, 0x20, + 0x13, 0xe4, 0x1d, 0x58, 0x63, 0x42, 0x8b, 0x81, 0x32, 0x34, 0x83, 0x26, 0x13, 0xb9, 0x08, 0xce, + 0x11, 0x34, 0x7b, 0x19, 0x4f, 0xb9, 0x88, 0x26, 0xe4, 0x73, 0x68, 0xa6, 0xfa, 0x19, 0xcf, 0x6e, + 0x75, 0x5a, 0x15, 0xe5, 0xeb, 0x2c, 0x5d, 0x79, 0x81, 0x72, 0x7e, 0x35, 0xc1, 0x9a, 0x07, 0x7b, + 0x4f, 0x8e, 0x2a, 0xb5, 0xfc, 0x04, 0xc8, 0x1c, 0x13, 0xa6, 0x7c, 0x12, 0x96, 0x85, 0x7d, 0x73, + 0x1e, 0xe9, 0xf1, 0x09, 0xf6, 0x88, 0x1c, 0xc2, 0x7a, 0x39, 0x5b, 0x4b, 0xfb, 0x1f, 0x64, 0xd0, + 0xf5, 0x59, 0x25, 0x46, 0x87, 0xc3, 0x9a, 0x37, 0xd7, 0xe6, 0x96, 0xbd, 0x7e, 0x00, 0x35, 0xd5, + 0x07, 0xbd, 0xff, 0x76, 0x75, 0x6b, 0xf5, 0xbe, 0x98, 0xed, 0x7c, 0x06, 0xb5, 0x13, 0x2e, 0x29, + 0x71, 0xa1, 0x36, 0xe3, 0x92, 0x6a, 0x65, 0x2b, 0xd0, 0x2a, 0x33, 0xc0, 0x3c, 0xe7, 0x27, 0x13, + 0x1a, 0x7e, 0x24, 0x10, 0x7b, 0xbb, 0x3a, 0x1f, 0x42, 0x4d, 0xb1, 0x61, 0x9d, 0x9b, 0x55, 0x23, + 0xd8, 0x67, 0xa3, 0x84, 0xc6, 0xc7, 0x62, 0xf4, 0xf4, 0x3c, 0xa5, 0x01, 0x02, 0x14, 0x1d, 0x4b, + 0x62, 0xfa, 0x1c, 0x07, 0xad, 0x1e, 0xe4, 0x0b, 0xe7, 0x77, 0x13, 0xd6, 0x55, 0x15, 0x7d, 0x2a, + 0x8f, 0xa3, 0x1f, 0x3b, 0x7b, 0xff, 0x57, 0x35, 0x07, 0xd0, 0xcc, 0x87, 0x9f, 0xc5, 0x7a, 0xf2, + 0xdf, 0xbd, 0x1e, 0x8c, 0xfd, 0x3c, 0x78, 0xec, 0x6d, 0x29, 0xd5, 0x2f, 0x5e, 0xdd, 0x6b, 0xe8, + 0x17, 0x41, 0x03, 0xf1, 0x07, 0xb1, 0xf3, 0xb7, 0x09, 0x96, 0x3e, 0x82, 0xc7, 0xa4, 0x78, 0xfd, + 0x4e, 0x40, 0xf6, 0xa1, 0xae, 0xa6, 0x42, 0xe0, 0x05, 0xbe, 0xcd, 0xf0, 0xe7, 0x30, 0xe7, 0x97, + 0x3a, 0x34, 0x8e, 0xa9, 0x10, 0xd1, 0x88, 0x92, 0x2e, 0x6c, 0x26, 0xf4, 0x2c, 0xbf, 0x74, 0x21, + 0xda, 0x6e, 0x3e, 0x93, 0x1f, 0xba, 0x55, 0x1f, 0x0f, 0xb7, 0x6c, 0xed, 0xbe, 0x11, 0xac, 0x27, + 0x65, 0xab, 0xff, 0x1a, 0xb6, 0x14, 0xdf, 0x4c, 0x79, 0x68, 0x88, 0x05, 0xa3, 0x7e, 0x56, 0xe7, + 0xa3, 0x7f, 0x25, 0x5c, 0x78, 0xae, 0x6f, 0x04, 0x1b, 0xc9, 0x15, 0x13, 0x2e, 0x5b, 0x51, 0xc5, + 0x75, 0x5f, 0x70, 0xcd, 0x1d, 0xc7, 0x2f, 0x59, 0x11, 0xf9, 0x6a, 0xc9, 0x34, 0x72, 0xfd, 0x3f, + 0xb8, 0x99, 0xa5, 0xf7, 0xe4, 0xc8, 0xbf, 0xea, 0x19, 0xe4, 0x31, 0xc0, 0xc2, 0x86, 0x75, 0x07, + 0xee, 0x57, 0x33, 0x15, 0xfe, 0xe2, 0x1b, 0xc1, 0x5a, 0x61, 0xc4, 0xca, 0x3e, 0xd0, 0x00, 0x56, + 0xaf, 0xb7, 0xd6, 0x05, 0x5e, 0x4d, 0xaa, 0x6f, 0xe4, 0x36, 0x40, 0xf6, 0xa1, 0x39, 0x8e, 0x44, + 0x88, 0xc8, 0x06, 0x22, 0xdf, 0xab, 0x46, 0x6a, 0xbf, 0xf0, 0x8d, 0xa0, 0x31, 0xd6, 0xd6, 0xd1, + 0x85, 0x4d, 0x85, 0xc5, 0x4f, 0xd3, 0x54, 0x5d, 0x5f, 0xbb, 0x79, 0x53, 0xb3, 0xcb, 0x97, 0x5d, + 0x35, 0x7b, 0x56, 0xbe, 0xfc, 0x87, 0xb0, 0x51, 0xf0, 0xa9, 0x79, 0xb3, 0xd7, 0x6e, 0x12, 0xb6, + 0x74, 0xf1, 0x94, 0xb0, 0xb3, 0xc5, 0xd2, 0xab, 0xc3, 0x8a, 0x38, 0x9d, 0x7a, 0xdf, 0xbc, 0xb8, + 0x68, 0x99, 0x2f, 0x2f, 0x5a, 0xe6, 0x9f, 0x17, 0x2d, 0xf3, 0xe7, 0xcb, 0x96, 0xf1, 0xf2, 0xb2, + 0x65, 0xfc, 0x71, 0xd9, 0x32, 0xbe, 0xdb, 0x1f, 0x31, 0x39, 0x3e, 0x1d, 0x28, 0xf2, 0xf6, 0xe1, + 0xb7, 0x27, 0x5f, 0x76, 0xa9, 0x3c, 0xe3, 0xd9, 0xb3, 0xf6, 0xd2, 0x3f, 0x49, 0xfe, 0x5b, 0x53, + 0xbc, 0x2c, 0xf6, 0x1e, 0xac, 0x62, 0x64, 0xef, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x25, + 0x69, 0xf9, 0x3d, 0x09, 0x00, 0x00, } func (m *NewRoundStep) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/consensus/types.proto b/proto/cometbft/v034x/consensus/types.proto similarity index 68% rename from proto/tendermint/consensus/types.proto rename to proto/cometbft/v034x/consensus/types.proto index 5048f85452f..c062d395952 100644 --- a/proto/tendermint/consensus/types.proto +++ b/proto/cometbft/v034x/consensus/types.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.consensus; +package cometbft.v034x.consensus; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus"; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; -import "tendermint/libs/bits/types.proto"; +import "cometbft/v034x/types/types.proto"; +import "cometbft/v034x/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.v034x.types.PartSetHeader block_part_set_header = 3 [(gogoproto.nullable) = false]; + cometbft.v034x.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.v034x.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.v034x.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.v034x.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.v034x.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.v034x.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.v034x.types.SignedMsgType type = 3; + cometbft.v034x.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.v034x.types.SignedMsgType type = 3; + cometbft.v034x.types.BlockID block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; + cometbft.v034x.libs.bits.BitArray votes = 5 [(gogoproto.nullable) = false]; } message Message { diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/cometbft/v034x/consensus/wal.pb.go similarity index 88% rename from proto/tendermint/consensus/wal.pb.go rename to proto/cometbft/v034x/consensus/wal.pb.go index fd80819cd08..d51803c70d7 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/cometbft/v034x/consensus/wal.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/consensus/wal.proto +// source: cometbft/v034x/consensus/wal.proto package consensus import ( fmt "fmt" + types "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - types "github.com/tendermint/tendermint/proto/tendermint/types" io "io" math "math" math_bits "math/bits" @@ -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_b8052837ca5a7f0c, []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_b8052837ca5a7f0c, []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_b8052837ca5a7f0c, []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_b8052837ca5a7f0c, []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_b8052837ca5a7f0c, []int{4} } func (m *TimedWALMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -362,51 +362,54 @@ 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{ - // 539 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdd, 0x8a, 0xd3, 0x40, - 0x14, 0xce, 0x6c, 0xff, 0x4f, 0x15, 0x21, 0x96, 0xa5, 0x16, 0x36, 0x8d, 0x5d, 0x84, 0x5e, 0x25, - 0xb0, 0x22, 0x88, 0x5e, 0xa8, 0xa5, 0x2b, 0x2d, 0xb8, 0x20, 0xe3, 0x8a, 0x20, 0x42, 0x48, 0x37, - 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, 0xd9, 0xbb, 0x39, 0x73, - 0xbe, 0x73, 0xbe, 0x73, 0xbe, 0x6f, 0x06, 0x2c, 0x89, 0x2c, 0xc0, 0x24, 0x8e, 0x98, 0x74, 0x2f, - 0x38, 0x13, 0xc8, 0x44, 0x2a, 0xdc, 0x6f, 0xfe, 0xa5, 0xb3, 0x4c, 0xb8, 0xe4, 0x66, 0x67, 0x9f, - 0x77, 0x76, 0xf9, 0x5e, 0x27, 0xe4, 0x21, 0x57, 0x00, 0x37, 0x3b, 0x69, 0x6c, 0xcf, 0x2e, 0xed, - 0x25, 0xbf, 0x2f, 0x51, 0xe4, 0x88, 0xa3, 0x02, 0x42, 0xdd, 0xbb, 0xf8, 0x15, 0x99, 0xdc, 0xa6, - 0xad, 0x90, 0xf3, 0xf0, 0x12, 0x5d, 0x15, 0xcd, 0xd2, 0xb9, 0x1b, 0xa4, 0x89, 0x2f, 0x23, 0xce, - 0xf2, 0x7c, 0xff, 0xff, 0xbc, 0x8c, 0x62, 0x14, 0xd2, 0x8f, 0x97, 0x1a, 0x30, 0x40, 0x68, 0x9c, - 0x89, 0x70, 0xca, 0xe6, 0xdc, 0x7c, 0x06, 0x95, 0x58, 0x84, 0x5d, 0x62, 0x93, 0x61, 0xfb, 0xe4, - 0xc8, 0x29, 0x5b, 0xc3, 0x39, 0x43, 0x21, 0xfc, 0x10, 0x47, 0xd5, 0xab, 0x9b, 0xbe, 0x41, 0x33, - 0xbc, 0x79, 0x0c, 0x8d, 0x25, 0x62, 0xe2, 0x45, 0x41, 0xf7, 0xc0, 0x26, 0xc3, 0xd6, 0x08, 0xd6, - 0x37, 0xfd, 0xfa, 0x7b, 0xc4, 0x64, 0x3a, 0xa6, 0xf5, 0x2c, 0x35, 0x0d, 0x06, 0x2b, 0x02, 0xed, - 0xf3, 0x28, 0x46, 0x9e, 0x4a, 0xc5, 0xf5, 0x0a, 0x9a, 0xdb, 0x49, 0x73, 0xc2, 0x47, 0x8e, 0x1e, - 0xd5, 0xd9, 0x8e, 0xea, 0x8c, 0x73, 0xc0, 0xa8, 0x99, 0x91, 0xfd, 0xfc, 0xd3, 0x27, 0x74, 0x57, - 0x64, 0x1e, 0x42, 0x7d, 0x81, 0x51, 0xb8, 0x90, 0x8a, 0xb4, 0x42, 0xf3, 0xc8, 0xec, 0x40, 0x2d, - 0xe1, 0x29, 0x0b, 0xba, 0x15, 0x9b, 0x0c, 0x6b, 0x54, 0x07, 0xa6, 0x09, 0x55, 0x21, 0x71, 0xd9, - 0xad, 0xda, 0x64, 0x78, 0x9f, 0xaa, 0xf3, 0xe0, 0x18, 0x5a, 0xa7, 0x2c, 0x98, 0xe8, 0xb2, 0x7d, - 0x3b, 0x52, 0x6c, 0x37, 0xf8, 0x75, 0x00, 0xf0, 0xe9, 0xcd, 0xbb, 0x7c, 0x6d, 0xf3, 0x0b, 0x1c, - 0x2a, 0xf9, 0xbd, 0xc0, 0x97, 0xbe, 0xa7, 0x7a, 0x7b, 0x42, 0xfa, 0x12, 0xf3, 0x25, 0x9e, 0x14, - 0x55, 0xd3, 0x36, 0x9e, 0x66, 0xf8, 0xb1, 0x2f, 0x7d, 0x9a, 0xa1, 0x3f, 0x64, 0xe0, 0x89, 0x41, - 0x1f, 0xe2, 0xed, 0x6b, 0xf3, 0x05, 0x34, 0x63, 0x11, 0x7a, 0x11, 0x9b, 0x73, 0xb5, 0xd5, 0xdd, - 0x2e, 0x68, 0xc7, 0x26, 0x06, 0x6d, 0xc4, 0xb9, 0x79, 0x6f, 0xe1, 0x9e, 0xd4, 0xfa, 0xea, 0xfa, - 0x8a, 0xaa, 0x7f, 0x5c, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x1a, 0x00, - 0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0x9d, 0x7a, 0x13, 0x83, 0xb6, 0x70, - 0x1b, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x01, 0x0f, 0x32, 0x9a, 0xa0, 0xa0, 0xde, 0x73, - 0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x5b, 0x86, 0x9f, 0x6f, 0xdf, 0xa6, 0x76, 0x7c, 0x95, 0x39, - 0xae, 0x2a, 0xcc, 0x13, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x7b, 0x22, 0xf5, 0x2e, 0x47, - 0x1f, 0xaf, 0xd6, 0x16, 0xb9, 0x5e, 0x5b, 0xe4, 0xef, 0xda, 0x22, 0xab, 0x8d, 0x65, 0x5c, 0x6f, - 0x2c, 0xe3, 0xf7, 0xc6, 0x32, 0x3e, 0xbf, 0x0c, 0x23, 0xb9, 0x48, 0x67, 0xce, 0x05, 0x8f, 0xdd, - 0xe2, 0xf7, 0xda, 0x1f, 0xf5, 0x47, 0x2d, 0xfb, 0x9c, 0xb3, 0xba, 0xca, 0x3d, 0xfd, 0x17, 0x00, - 0x00, 0xff, 0xff, 0x0b, 0xad, 0x1c, 0x1b, 0x07, 0x04, 0x00, 0x00, + proto.RegisterType((*MsgInfo)(nil), "cometbft.v034x.consensus.MsgInfo") + proto.RegisterType((*TimeoutInfo)(nil), "cometbft.v034x.consensus.TimeoutInfo") + proto.RegisterType((*EndHeight)(nil), "cometbft.v034x.consensus.EndHeight") + proto.RegisterType((*WALMessage)(nil), "cometbft.v034x.consensus.WALMessage") + proto.RegisterType((*TimedWALMessage)(nil), "cometbft.v034x.consensus.TimedWALMessage") +} + +func init() { + proto.RegisterFile("cometbft/v034x/consensus/wal.proto", fileDescriptor_b8052837ca5a7f0c) +} + +var fileDescriptor_b8052837ca5a7f0c = []byte{ + // 559 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xf5, 0x36, 0x69, 0x3e, 0x26, 0x20, 0x24, 0x53, 0x55, 0x21, 0x07, 0x27, 0x75, 0x8a, 0x14, + 0x2e, 0x36, 0xa2, 0x08, 0xc1, 0xa5, 0x88, 0x28, 0x91, 0x12, 0xa0, 0x08, 0x99, 0x8a, 0xaf, 0x8b, + 0x71, 0xea, 0x89, 0x63, 0x51, 0x7b, 0x23, 0xef, 0xba, 0x85, 0x33, 0x7f, 0x20, 0x47, 0xfe, 0x11, + 0x3d, 0xf6, 0xc8, 0xa9, 0xa0, 0xe4, 0x8f, 0xa0, 0xdd, 0xb5, 0xd3, 0x28, 0x55, 0xb8, 0x79, 0x3c, + 0x6f, 0xde, 0x9b, 0x99, 0x37, 0x0b, 0xe6, 0x09, 0x8d, 0x90, 0x8f, 0xc6, 0xdc, 0x3e, 0x7b, 0x78, + 0xf0, 0xf8, 0x9b, 0x7d, 0x42, 0x63, 0x86, 0x31, 0x4b, 0x99, 0x7d, 0xee, 0x9d, 0x5a, 0xd3, 0x84, + 0x72, 0xaa, 0xd7, 0x73, 0x8c, 0x25, 0x31, 0xd6, 0x12, 0xd3, 0xd8, 0x09, 0x68, 0x40, 0x25, 0xc8, + 0x16, 0x5f, 0x0a, 0xdf, 0xd8, 0xdf, 0xc8, 0xc9, 0xbf, 0x4f, 0x91, 0x65, 0xa8, 0xbd, 0x35, 0x94, + 0xcc, 0xd9, 0x78, 0x86, 0x31, 0xcf, 0x21, 0x46, 0x40, 0x69, 0x70, 0x8a, 0xb6, 0x8c, 0x46, 0xe9, + 0xd8, 0xf6, 0xd3, 0xc4, 0xe3, 0x21, 0x8d, 0xb3, 0x7c, 0x73, 0x3d, 0xcf, 0xc3, 0x08, 0x19, 0xf7, + 0xa2, 0xa9, 0x02, 0x98, 0x21, 0x94, 0x8f, 0x58, 0x30, 0x8c, 0xc7, 0x54, 0x7f, 0x06, 0x85, 0x88, + 0x05, 0x75, 0xd2, 0x22, 0x9d, 0xda, 0xa3, 0x3d, 0x6b, 0xd3, 0x48, 0xd6, 0x11, 0x32, 0xe6, 0x05, + 0xd8, 0x2d, 0x5e, 0x5c, 0x35, 0x35, 0x47, 0xd4, 0xe8, 0x6d, 0x28, 0x4f, 0x11, 0x13, 0x37, 0xf4, + 0xeb, 0x5b, 0x2d, 0xd2, 0xa9, 0x76, 0x61, 0x7e, 0xd5, 0x2c, 0xbd, 0x45, 0x4c, 0x86, 0x3d, 0xa7, + 0x24, 0x52, 0x43, 0xdf, 0x9c, 0x11, 0xa8, 0x1d, 0x87, 0x11, 0xd2, 0x94, 0x4b, 0xbd, 0xe7, 0x50, + 0xc9, 0xbb, 0xcd, 0x44, 0xef, 0x59, 0xaa, 0x5d, 0x2b, 0x6f, 0xd7, 0xea, 0x65, 0x80, 0x6e, 0x45, + 0x88, 0xfd, 0xfc, 0xd3, 0x24, 0xce, 0xb2, 0x48, 0xdf, 0x85, 0xd2, 0x04, 0xc3, 0x60, 0xc2, 0xa5, + 0x68, 0xc1, 0xc9, 0x22, 0x7d, 0x07, 0xb6, 0x13, 0x9a, 0xc6, 0x7e, 0xbd, 0xd0, 0x22, 0x9d, 0x6d, + 0x47, 0x05, 0xba, 0x0e, 0x45, 0xc6, 0x71, 0x5a, 0x2f, 0xb6, 0x48, 0xe7, 0xb6, 0x23, 0xbf, 0xcd, + 0x36, 0x54, 0xfb, 0xb1, 0x3f, 0x50, 0x65, 0xd7, 0x74, 0x64, 0x95, 0xce, 0xfc, 0xb5, 0x05, 0xf0, + 0xe1, 0xc5, 0xeb, 0x6c, 0x6c, 0xfd, 0x0b, 0xec, 0x4a, 0x0b, 0x5c, 0xdf, 0xe3, 0x9e, 0x2b, 0xb9, + 0x5d, 0xc6, 0x3d, 0x8e, 0xd9, 0x10, 0x0f, 0xd6, 0x37, 0xa7, 0x2c, 0xed, 0x8b, 0x9a, 0x9e, 0xc7, + 0x3d, 0x47, 0x54, 0xbc, 0x13, 0x05, 0x03, 0xcd, 0xb9, 0x8b, 0x37, 0x7f, 0xeb, 0x87, 0x50, 0x89, + 0x58, 0xe0, 0x86, 0xf1, 0x98, 0xca, 0xc9, 0xfe, 0xef, 0x86, 0x72, 0x6f, 0xa0, 0x39, 0xe5, 0x28, + 0x33, 0xf2, 0x25, 0xdc, 0xe2, 0x6a, 0xcf, 0x8a, 0xa3, 0x20, 0x39, 0xee, 0x6f, 0xe6, 0x58, 0x71, + 0x65, 0xa0, 0x39, 0x35, 0xbe, 0x62, 0x52, 0x0f, 0x00, 0x63, 0xdf, 0xcd, 0x16, 0x53, 0x94, 0x4c, + 0xed, 0xcd, 0x4c, 0xcb, 0x6d, 0x0e, 0x34, 0xa7, 0x8a, 0x79, 0xd0, 0xdd, 0x86, 0x02, 0x4b, 0x23, + 0xf3, 0x07, 0x81, 0x3b, 0x42, 0xcb, 0x5f, 0x59, 0xe7, 0x53, 0x28, 0x0a, 0xbd, 0x6c, 0x79, 0x8d, + 0x1b, 0x17, 0x70, 0x9c, 0x1f, 0xac, 0x3a, 0x81, 0x99, 0x38, 0x01, 0x59, 0xa1, 0x3f, 0x51, 0xf7, + 0xaa, 0x36, 0xb4, 0xbf, 0xb9, 0xa7, 0x6b, 0x31, 0x79, 0xac, 0xdd, 0x8f, 0x17, 0x73, 0x83, 0x5c, + 0xce, 0x0d, 0xf2, 0x77, 0x6e, 0x90, 0xd9, 0xc2, 0xd0, 0x2e, 0x17, 0x86, 0xf6, 0x7b, 0x61, 0x68, + 0x9f, 0x0f, 0x83, 0x90, 0x4f, 0xd2, 0x91, 0xa0, 0xb2, 0x5f, 0x7d, 0x7a, 0xdf, 0x7f, 0x83, 0xfc, + 0x9c, 0x26, 0x5f, 0xed, 0xb5, 0x77, 0xa8, 0x9e, 0xf3, 0xf2, 0xe7, 0x52, 0x69, 0x54, 0x92, 0x99, + 0x83, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xe8, 0x39, 0xd5, 0x33, 0x04, 0x00, 0x00, } func (m *MsgInfo) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/consensus/wal.proto b/proto/cometbft/v034x/consensus/wal.proto similarity index 80% rename from proto/tendermint/consensus/wal.proto rename to proto/cometbft/v034x/consensus/wal.proto index 44afa2c0c3d..0dba7a7865d 100644 --- a/proto/tendermint/consensus/wal.proto +++ b/proto/cometbft/v034x/consensus/wal.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.consensus; +package cometbft.v034x.consensus; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/consensus"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus"; import "gogoproto/gogo.proto"; -import "tendermint/consensus/types.proto"; -import "tendermint/types/events.proto"; +import "cometbft/v034x/consensus/types.proto"; +import "cometbft/v034x/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.v034x.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/v034x/crypto/keys.pb.go similarity index 88% rename from proto/tendermint/crypto/keys.pb.go rename to proto/cometbft/v034x/crypto/keys.pb.go index c5cdf19a2f7..19e51bf4c1f 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/cometbft/v034x/crypto/keys.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/crypto/keys.proto +// source: cometbft/v034x/crypto/keys.proto package crypto @@ -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_f7a57822b07d0ae6, []int{0} } func (m *PublicKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,26 +114,27 @@ 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{ - // 199 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, 0xa7, 0xa0, 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, - 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0xf2, 0x05, 0x12, 0x13, - 0xe2, 0x4c, 0x0c, 0x1f, 0x26, 0xb1, 0x81, 0x25, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe8, - 0x1d, 0x1e, 0xe2, 0xfd, 0x00, 0x00, 0x00, + proto.RegisterType((*PublicKey)(nil), "cometbft.v034x.crypto.PublicKey") +} + +func init() { proto.RegisterFile("cometbft/v034x/crypto/keys.proto", fileDescriptor_f7a57822b07d0ae6) } + +var fileDescriptor_f7a57822b07d0ae6 = []byte{ + // 218 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, 0x30, 0x36, 0xa9, 0xd0, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, + 0xc9, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa9, + 0xd0, 0x03, 0xab, 0xd0, 0x83, 0xa8, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd0, 0x07, + 0xb1, 0x20, 0x8a, 0x95, 0x22, 0xb8, 0x38, 0x03, 0x4a, 0x93, 0x72, 0x32, 0x93, 0xbd, 0x53, 0x2b, + 0x85, 0xa4, 0xb8, 0xd8, 0x53, 0x53, 0x8c, 0x4c, 0x4d, 0x0d, 0x2d, 0x25, 0x18, 0x15, 0x18, 0x35, + 0x78, 0x3c, 0x18, 0x82, 0x60, 0x02, 0x42, 0x72, 0x5c, 0x9c, 0xc5, 0xa9, 0xc9, 0x05, 0x46, 0xa6, + 0x66, 0xd9, 0x86, 0x12, 0x4c, 0x50, 0x59, 0x84, 0x90, 0x15, 0xc7, 0x8b, 0x05, 0xf2, 0x8c, 0x2f, + 0x16, 0xca, 0x33, 0x3a, 0xb1, 0x72, 0x31, 0x17, 0x97, 0xe6, 0x3a, 0x85, 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, 0x75, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, + 0x7e, 0xae, 0xbe, 0x77, 0x64, 0x98, 0xab, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0xb6, 0x3e, 0x9a, + 0xcf, 0x20, 0x6e, 0x85, 0x0b, 0x42, 0xbc, 0x91, 0xc4, 0x06, 0x16, 0x36, 0x06, 0x04, 0x00, 0x00, + 0xff, 0xff, 0xf4, 0x56, 0x5c, 0x7d, 0x08, 0x01, 0x00, 0x00, } func (this *PublicKey) Compare(that interface{}) int { diff --git a/proto/tendermint/crypto/keys.proto b/proto/cometbft/v034x/crypto/keys.proto similarity index 70% rename from proto/tendermint/crypto/keys.proto rename to proto/cometbft/v034x/crypto/keys.proto index 5b94ddaec9a..e263fdefb51 100644 --- a/proto/tendermint/crypto/keys.proto +++ b/proto/cometbft/v034x/crypto/keys.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.crypto; +package cometbft.v034x.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/cometbft/v034x/crypto/proof.pb.go similarity index 90% rename from proto/tendermint/crypto/proof.pb.go rename to proto/cometbft/v034x/crypto/proof.pb.go index 82fb943fcdd..fa7e812475a 100644 --- a/proto/tendermint/crypto/proof.pb.go +++ b/proto/cometbft/v034x/crypto/proof.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/crypto/proof.proto +// source: cometbft/v034x/crypto/proof.proto package crypto @@ -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_f8e13479a041bb8e, []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_f8e13479a041bb8e, []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_f8e13479a041bb8e, []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_f8e13479a041bb8e, []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_f8e13479a041bb8e, []int{4} } func (m *ProofOps) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -314,39 +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.v034x.crypto.Proof") + proto.RegisterType((*ValueOp)(nil), "cometbft.v034x.crypto.ValueOp") + proto.RegisterType((*DominoOp)(nil), "cometbft.v034x.crypto.DominoOp") + proto.RegisterType((*ProofOp)(nil), "cometbft.v034x.crypto.ProofOp") + proto.RegisterType((*ProofOps)(nil), "cometbft.v034x.crypto.ProofOps") } -func init() { proto.RegisterFile("tendermint/crypto/proof.proto", fileDescriptor_6b60b6ba2ab5b856) } +func init() { proto.RegisterFile("cometbft/v034x/crypto/proof.proto", fileDescriptor_f8e13479a041bb8e) } -var fileDescriptor_6b60b6ba2ab5b856 = []byte{ - // 351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbb, 0x4e, 0xc3, 0x30, - 0x14, 0x4d, 0xea, 0xf4, 0x75, 0xdb, 0x01, 0xac, 0x0a, 0x45, 0x45, 0x84, 0x28, 0x53, 0xa6, 0x44, - 0x2a, 0x0b, 0x13, 0x43, 0x61, 0x40, 0x30, 0x14, 0x79, 0x60, 0x60, 0x41, 0x6e, 0xeb, 0x36, 0x11, - 0x6d, 0x6c, 0x25, 0x8e, 0x44, 0xff, 0x82, 0xcf, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xf6, 0x47, 0x90, - 0xed, 0xa0, 0x16, 0x55, 0x6c, 0xe7, 0x71, 0x7d, 0x7c, 0xac, 0x6b, 0xb8, 0x90, 0x2c, 0x9b, 0xb2, - 0x7c, 0x99, 0x66, 0x32, 0x9e, 0xe4, 0x2b, 0x21, 0x79, 0x2c, 0x72, 0xce, 0x67, 0x91, 0xc8, 0xb9, - 0xe4, 0xf8, 0x74, 0x6f, 0x47, 0xc6, 0xee, 0xf7, 0xe6, 0x7c, 0xce, 0xb5, 0x1b, 0x2b, 0x64, 0x06, - 0x83, 0x19, 0xd4, 0x9f, 0xd4, 0x39, 0xdc, 0x83, 0xba, 0xe4, 0x92, 0x2e, 0x5c, 0xdb, 0xb7, 0x43, - 0x44, 0x0c, 0x51, 0x6a, 0x9a, 0x4d, 0xd9, 0xbb, 0x5b, 0x33, 0xaa, 0x26, 0xf8, 0x1c, 0xda, 0x0b, - 0x46, 0x67, 0xaf, 0x09, 0x2d, 0x12, 0x17, 0xf9, 0x76, 0xd8, 0x25, 0x2d, 0x25, 0xdc, 0xd3, 0x22, - 0x51, 0x47, 0x68, 0x99, 0xc9, 0xc2, 0x75, 0x7c, 0x14, 0x76, 0x89, 0x21, 0xc1, 0x23, 0x34, 0x9f, - 0xe9, 0xa2, 0x64, 0x23, 0x81, 0x4f, 0x00, 0xbd, 0xb1, 0x95, 0xbe, 0xa7, 0x4b, 0x14, 0xc4, 0x11, - 0xd4, 0x75, 0x79, 0x7d, 0x4b, 0x67, 0xe0, 0x46, 0x47, 0xed, 0x23, 0x5d, 0x92, 0x98, 0xb1, 0xe0, - 0x01, 0x5a, 0x77, 0x7c, 0x99, 0x66, 0xfc, 0x6f, 0x5a, 0xdb, 0xa4, 0xe9, 0xce, 0xa2, 0x94, 0x3a, - 0xad, 0x4d, 0x0c, 0xc1, 0x67, 0xd0, 0xe0, 0xa5, 0x54, 0x32, 0xd2, 0x72, 0xc5, 0x82, 0x5b, 0x68, - 0xea, 0xec, 0x91, 0xc0, 0x18, 0x1c, 0xb9, 0x12, 0xac, 0xca, 0xd2, 0xf8, 0x37, 0xbe, 0xb6, 0x2f, - 0x8b, 0xc1, 0x99, 0x52, 0x49, 0xab, 0x77, 0x6b, 0x1c, 0xdc, 0x40, 0xab, 0x0a, 0x29, 0xf0, 0x00, - 0x10, 0x17, 0x85, 0x6b, 0xfb, 0x28, 0xec, 0x0c, 0xfa, 0xff, 0x3d, 0x65, 0x24, 0x86, 0xce, 0xfa, - 0xeb, 0xd2, 0x22, 0x6a, 0x78, 0x48, 0xd6, 0x5b, 0xcf, 0xde, 0x6c, 0x3d, 0xfb, 0x7b, 0xeb, 0xd9, - 0x1f, 0x3b, 0xcf, 0xda, 0xec, 0x3c, 0xeb, 0x73, 0xe7, 0x59, 0x2f, 0xd7, 0xf3, 0x54, 0x26, 0xe5, - 0x38, 0x9a, 0xf0, 0x65, 0x7c, 0xb0, 0xf2, 0x03, 0x68, 0x56, 0x7a, 0xf4, 0x1d, 0xc6, 0x0d, 0x6d, - 0x5c, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x43, 0x5d, 0xb9, 0x45, 0x2a, 0x02, 0x00, 0x00, +var fileDescriptor_f8e13479a041bb8e = []byte{ + // 373 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x4a, 0xeb, 0x40, + 0x14, 0xc6, 0x93, 0x26, 0xfd, 0x37, 0xed, 0xe2, 0x32, 0xf4, 0x5e, 0xc2, 0xbd, 0x97, 0x18, 0xb3, + 0xca, 0x2a, 0x91, 0x56, 0xdc, 0xb8, 0xab, 0x0a, 0xa2, 0x60, 0x24, 0x60, 0x41, 0x37, 0x32, 0x6d, + 0x27, 0x4d, 0xe9, 0x9f, 0x19, 0x92, 0x89, 0xb6, 0x6f, 0xe1, 0x63, 0x75, 0xd9, 0xa5, 0x2b, 0x91, + 0xf6, 0x45, 0x64, 0xce, 0xa4, 0x8a, 0x22, 0xee, 0xce, 0xf7, 0xf1, 0x9d, 0xdf, 0x39, 0x87, 0x19, + 0xb4, 0x3f, 0x60, 0x33, 0x2a, 0xfa, 0xb1, 0x08, 0x1e, 0x0e, 0x3a, 0x87, 0x8b, 0x60, 0x90, 0x2e, + 0xb9, 0x60, 0x01, 0x4f, 0x19, 0x8b, 0x7d, 0x9e, 0x32, 0xc1, 0xf0, 0xef, 0x5d, 0xc4, 0x87, 0x88, + 0xaf, 0x22, 0x7f, 0x5b, 0x23, 0x36, 0x62, 0x90, 0x08, 0x64, 0xa5, 0xc2, 0x6e, 0x8c, 0xca, 0xd7, + 0xb2, 0x17, 0xb7, 0x50, 0x59, 0x30, 0x41, 0xa6, 0x96, 0xee, 0xe8, 0x9e, 0x11, 0x29, 0x21, 0xdd, + 0xf1, 0x7c, 0x48, 0x17, 0x56, 0x49, 0xb9, 0x20, 0xf0, 0x3f, 0x54, 0x9f, 0x52, 0x12, 0xdf, 0x27, + 0x24, 0x4b, 0x2c, 0xc3, 0xd1, 0xbd, 0x66, 0x54, 0x93, 0xc6, 0x39, 0xc9, 0x12, 0xd9, 0x42, 0xf2, + 0xb9, 0xc8, 0x2c, 0xd3, 0x31, 0xbc, 0x66, 0xa4, 0x84, 0x1b, 0xa2, 0x6a, 0x8f, 0x4c, 0x73, 0x1a, + 0x72, 0xfc, 0x0b, 0x19, 0x13, 0xba, 0x84, 0x39, 0xcd, 0x48, 0x96, 0xb8, 0x8d, 0xca, 0x70, 0x00, + 0x4c, 0x69, 0xb4, 0xff, 0xfb, 0xdf, 0x5e, 0xe0, 0xc3, 0xa2, 0x91, 0x8a, 0xba, 0x17, 0xa8, 0x76, + 0xca, 0x66, 0xe3, 0x39, 0xfb, 0x4c, 0xac, 0x2b, 0x22, 0xec, 0xcd, 0x73, 0x01, 0xc4, 0x7a, 0xa4, + 0x04, 0xfe, 0x83, 0x2a, 0x2c, 0x17, 0xd2, 0x36, 0xc0, 0x2e, 0x94, 0x7b, 0x82, 0xaa, 0xc0, 0x0e, + 0x39, 0xc6, 0xc8, 0x14, 0x4b, 0x4e, 0x0b, 0x16, 0xd4, 0x3b, 0x7c, 0xe9, 0x63, 0x61, 0x8c, 0xcc, + 0x21, 0x11, 0xa4, 0xb8, 0x1d, 0x6a, 0xb7, 0x8b, 0x6a, 0x05, 0x24, 0xc3, 0x47, 0xc8, 0x60, 0x3c, + 0xb3, 0x74, 0xc7, 0xf0, 0x1a, 0x6d, 0xfb, 0xa7, 0x73, 0x42, 0xde, 0x35, 0x57, 0x2f, 0x7b, 0x5a, + 0x24, 0x1b, 0xba, 0x37, 0xab, 0x8d, 0xad, 0xaf, 0x37, 0xb6, 0xfe, 0xba, 0xb1, 0xf5, 0xa7, 0xad, + 0xad, 0xad, 0xb7, 0xb6, 0xf6, 0xbc, 0xb5, 0xb5, 0xbb, 0xe3, 0xd1, 0x58, 0x24, 0x79, 0x5f, 0xa2, + 0x82, 0xcb, 0xdb, 0xde, 0xd9, 0x15, 0x15, 0x8f, 0x2c, 0x9d, 0x04, 0x5f, 0xbe, 0x83, 0x7a, 0xdf, + 0x77, 0x53, 0x4d, 0xea, 0x57, 0xc0, 0xee, 0xbc, 0x05, 0x00, 0x00, 0xff, 0xff, 0x32, 0xc8, 0xc9, + 0x50, 0x3d, 0x02, 0x00, 0x00, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/crypto/proof.proto b/proto/cometbft/v034x/crypto/proof.proto similarity index 86% rename from proto/tendermint/crypto/proof.proto rename to proto/cometbft/v034x/crypto/proof.proto index 975df768539..cb1e61dda28 100644 --- a/proto/tendermint/crypto/proof.proto +++ b/proto/cometbft/v034x/crypto/proof.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.crypto; +package cometbft.v034x.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/cometbft/v034x/libs/bits/types.pb.go similarity index 85% rename from proto/tendermint/libs/bits/types.pb.go rename to proto/cometbft/v034x/libs/bits/types.pb.go index c0ebcb97600..f0f22e39845 100644 --- a/proto/tendermint/libs/bits/types.pb.go +++ b/proto/cometbft/v034x/libs/bits/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/libs/bits/types.proto +// source: cometbft/v034x/libs/bits/types.proto package 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_45cbea43765913d0, []int{0} } func (m *BitArray) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,24 +75,27 @@ func (m *BitArray) GetElems() []uint64 { } func init() { - proto.RegisterType((*BitArray)(nil), "tendermint.libs.bits.BitArray") + proto.RegisterType((*BitArray)(nil), "cometbft.v034x.libs.bits.BitArray") } -func init() { proto.RegisterFile("tendermint/libs/bits/types.proto", fileDescriptor_e91ab2672920d7d4) } +func init() { + proto.RegisterFile("cometbft/v034x/libs/bits/types.proto", fileDescriptor_45cbea43765913d0) +} -var fileDescriptor_e91ab2672920d7d4 = []byte{ - // 168 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, 0xe8, 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, 0x59, - 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x39, 0x09, 0x89, 0x09, - 0x76, 0x8d, 0x3e, 0x36, 0xe7, 0x26, 0xb1, 0x81, 0xe5, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x5b, 0x0c, 0xe3, 0x3e, 0xcd, 0x00, 0x00, 0x00, +var fileDescriptor_45cbea43765913d0 = []byte{ + // 186 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0x30, 0x36, 0xa9, 0xd0, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, + 0x4f, 0xca, 0x2c, 0x29, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x92, 0x80, 0xa9, 0xd2, 0x03, 0xab, 0xd2, 0x03, 0xa9, 0xd2, 0x03, 0xa9, 0x52, 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, 0x39, + 0x13, 0xec, 0x2c, 0x84, 0x20, 0xdc, 0xd5, 0x49, 0x6c, 0x60, 0x19, 0x63, 0x40, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x11, 0x4b, 0x80, 0xc8, 0xd8, 0x00, 0x00, 0x00, } func (m *BitArray) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v034x/libs/bits/types.proto b/proto/cometbft/v034x/libs/bits/types.proto new file mode 100644 index 00000000000..a968f6bbb6f --- /dev/null +++ b/proto/cometbft/v034x/libs/bits/types.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package cometbft.v034x.libs.bits; + +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/libs/bits"; + +message BitArray { + int64 bits = 1; + repeated uint64 elems = 2; +} diff --git a/proto/tendermint/mempool/message.go b/proto/cometbft/v034x/mempool/message.go similarity index 92% rename from proto/tendermint/mempool/message.go rename to proto/cometbft/v034x/mempool/message.go index e2e6c42a7d5..7339215c4b8 100644 --- a/proto/tendermint/mempool/message.go +++ b/proto/cometbft/v034x/mempool/message.go @@ -3,8 +3,8 @@ package mempool import ( "fmt" + "github.com/KYVENetwork/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p" ) var _ p2p.Wrapper = &Txs{} diff --git a/proto/tendermint/mempool/types.pb.go b/proto/cometbft/v034x/mempool/types.pb.go similarity index 87% rename from proto/tendermint/mempool/types.pb.go rename to proto/cometbft/v034x/mempool/types.pb.go index ffe5ab35977..a01ae726386 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/cometbft/v034x/mempool/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/mempool/types.proto +// source: cometbft/v034x/mempool/types.proto package mempool @@ -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_5b68fef63bf1ee73, []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_5b68fef63bf1ee73, []int{1} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -140,25 +140,28 @@ 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{ - // 179 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, 0xc1, - 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, 0x99, 0x9e, 0x59, 0x92, 0x51, - 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x8f, 0xe4, 0x60, 0x24, 0x26, 0xd8, 0xb5, 0xfa, 0x98, 0x9e, - 0x49, 0x62, 0x03, 0xcb, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xca, 0xc3, 0xa0, 0xfc, 0xe9, + proto.RegisterType((*Txs)(nil), "cometbft.v034x.mempool.Txs") + proto.RegisterType((*Message)(nil), "cometbft.v034x.mempool.Message") +} + +func init() { + proto.RegisterFile("cometbft/v034x/mempool/types.proto", fileDescriptor_5b68fef63bf1ee73) +} + +var fileDescriptor_5b68fef63bf1ee73 = []byte{ + // 195 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, 0x30, 0x36, 0xa9, 0xd0, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, + 0xcf, 0xcf, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x83, 0xa9, 0xd1, 0x03, 0xab, 0xd1, 0x83, 0xaa, 0x51, 0x12, 0xe7, 0x62, 0x0e, 0xa9, 0x28, 0x16, + 0x12, 0xe0, 0x62, 0x2e, 0xa9, 0x28, 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x09, 0x02, 0x31, 0x95, + 0x1c, 0xb9, 0xd8, 0x7d, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0xf4, 0x61, 0x92, 0x8c, 0x1a, + 0xdc, 0x46, 0xd2, 0x7a, 0xd8, 0x4d, 0xd2, 0x0b, 0xa9, 0x28, 0xf6, 0x60, 0x00, 0xeb, 0x75, 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, 0x51, 0xfa, 0xde, 0x91, 0x61, 0xae, + 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0xfa, 0x68, 0x1e, 0x01, 0x3b, 0x1d, 0x21, 0x08, 0xb5, + 0x29, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x64, 0x39, 0xd6, 0x03, 0xf8, 0x00, 0x00, 0x00, } diff --git a/proto/cometbft/v034x/mempool/types.proto b/proto/cometbft/v034x/mempool/types.proto new file mode 100644 index 00000000000..664cd7ae97f --- /dev/null +++ b/proto/cometbft/v034x/mempool/types.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; +package cometbft.v034x.mempool; + +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/mempool"; + +message Txs { + repeated bytes txs = 1; +} + +message Message { + oneof sum { + Txs txs = 1; + } +} diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/cometbft/v034x/p2p/conn.pb.go similarity index 88% rename from proto/tendermint/p2p/conn.pb.go rename to proto/cometbft/v034x/p2p/conn.pb.go index 16ee463a6a6..ed6ae2f50f0 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/cometbft/v034x/p2p/conn.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/conn.proto +// source: cometbft/v034x/p2p/conn.proto package p2p import ( fmt "fmt" + crypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" 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_70b92c0a1284f052, []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_70b92c0a1284f052, []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_70b92c0a1284f052, []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_70b92c0a1284f052, []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_70b92c0a1284f052, []int{4} } func (m *AuthSigMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -308,42 +308,43 @@ 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{ - // 395 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x3d, 0x8f, 0xd3, 0x40, - 0x10, 0xf5, 0xe2, 0xbb, 0x1c, 0x99, 0x84, 0x13, 0x5a, 0x51, 0x24, 0xd1, 0xc9, 0x89, 0x5c, 0xa5, - 0x40, 0xb6, 0x64, 0x44, 0x03, 0xa2, 0xc0, 0x7c, 0x88, 0xd3, 0x29, 0xba, 0xc8, 0x74, 0x34, 0x96, - 0x3f, 0x96, 0xf5, 0x2a, 0xe7, 0xdd, 0x55, 0x76, 0x5d, 0xf8, 0x5f, 0xf0, 0xb3, 0x8e, 0xee, 0x4a, - 0xaa, 0x08, 0x39, 0x7f, 0x04, 0x79, 0x1d, 0x88, 0x23, 0x71, 0xdd, 0x7b, 0x33, 0xf3, 0xe6, 0x43, - 0xf3, 0x60, 0xaa, 0x09, 0xcf, 0xc9, 0xb6, 0x64, 0x5c, 0xfb, 0x32, 0x90, 0x7e, 0x26, 0x38, 0xf7, - 0xe4, 0x56, 0x68, 0x81, 0x2f, 0x8f, 0x29, 0x4f, 0x06, 0x72, 0xf6, 0x82, 0x0a, 0x2a, 0x4c, 0xca, - 0x6f, 0x51, 0x57, 0x35, 0xbb, 0xea, 0x35, 0xc8, 0xb6, 0xb5, 0xd4, 0xc2, 0xdf, 0x90, 0x5a, 0x75, - 0x59, 0x77, 0x0c, 0xb0, 0x4e, 0xb2, 0x0d, 0xd1, 0x6b, 0xc6, 0x69, 0x8f, 0x09, 0x4e, 0xdd, 0x02, - 0x86, 0x1d, 0x5b, 0x29, 0x8a, 0x5f, 0x02, 0x64, 0x45, 0xc2, 0x39, 0xb9, 0x8b, 0x59, 0x3e, 0x41, - 0x0b, 0xb4, 0x3c, 0x0f, 0x9f, 0x35, 0xbb, 0xf9, 0xf0, 0x43, 0x17, 0xbd, 0xfe, 0x18, 0x0d, 0x0f, - 0x05, 0xd7, 0x39, 0x9e, 0x82, 0x4d, 0xc4, 0xf7, 0xc9, 0x93, 0x05, 0x5a, 0x3e, 0x0d, 0x2f, 0x9a, - 0xdd, 0xdc, 0xfe, 0x74, 0xfb, 0x39, 0x6a, 0x63, 0x18, 0xc3, 0x59, 0x9e, 0xe8, 0x64, 0x62, 0x2f, - 0xd0, 0x72, 0x1c, 0x19, 0xec, 0xfe, 0x44, 0x30, 0xe8, 0x46, 0xe1, 0x77, 0x30, 0x92, 0x06, 0xc5, - 0x92, 0x71, 0x6a, 0x06, 0x8d, 0x82, 0x99, 0x77, 0x7a, 0xaa, 0x77, 0xdc, 0xf9, 0x8b, 0x15, 0x81, - 0xfc, 0xc7, 0xfa, 0x72, 0xc1, 0xa9, 0x59, 0xe0, 0x71, 0xb9, 0x38, 0x91, 0x0b, 0x4e, 0xf1, 0x1b, - 0x38, 0xb0, 0xb8, 0x54, 0xd4, 0xac, 0x38, 0x0a, 0xa6, 0xff, 0x57, 0xaf, 0x54, 0x2b, 0x1e, 0xca, - 0xbf, 0x24, 0x3c, 0x07, 0x5b, 0x55, 0xa5, 0x1b, 0xc3, 0xe5, 0xfb, 0x4a, 0x17, 0x5f, 0x19, 0x5d, - 0x11, 0xa5, 0x12, 0x4a, 0xf0, 0x5b, 0xb8, 0x90, 0x55, 0x1a, 0x6f, 0x48, 0x7d, 0x38, 0xe7, 0xaa, - 0xdf, 0xb1, 0xfb, 0x89, 0xb7, 0xae, 0xd2, 0x3b, 0x96, 0xdd, 0x90, 0x3a, 0x3c, 0xbb, 0xdf, 0xcd, - 0xad, 0x68, 0x20, 0xab, 0xf4, 0x86, 0xd4, 0xf8, 0x39, 0xd8, 0x8a, 0x75, 0x87, 0x8c, 0xa3, 0x16, - 0x86, 0xb7, 0xf7, 0x8d, 0x83, 0x1e, 0x1a, 0x07, 0xfd, 0x6e, 0x1c, 0xf4, 0x63, 0xef, 0x58, 0x0f, - 0x7b, 0xc7, 0xfa, 0xb5, 0x77, 0xac, 0x6f, 0xaf, 0x29, 0xd3, 0x45, 0x95, 0x7a, 0x99, 0x28, 0xfd, - 0xde, 0xd7, 0xfb, 0x0e, 0x32, 0xee, 0x38, 0xb5, 0x54, 0x3a, 0x30, 0xd1, 0x57, 0x7f, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x30, 0xfd, 0xb2, 0x8d, 0x6b, 0x02, 0x00, 0x00, + proto.RegisterType((*PacketPing)(nil), "cometbft.v034x.p2p.PacketPing") + proto.RegisterType((*PacketPong)(nil), "cometbft.v034x.p2p.PacketPong") + proto.RegisterType((*PacketMsg)(nil), "cometbft.v034x.p2p.PacketMsg") + proto.RegisterType((*Packet)(nil), "cometbft.v034x.p2p.Packet") + proto.RegisterType((*AuthSigMessage)(nil), "cometbft.v034x.p2p.AuthSigMessage") +} + +func init() { proto.RegisterFile("cometbft/v034x/p2p/conn.proto", fileDescriptor_70b92c0a1284f052) } + +var fileDescriptor_70b92c0a1284f052 = []byte{ + // 414 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x33, 0x66, 0xb7, 0x6b, 0x5e, 0xab, 0xc8, 0xe0, 0xa1, 0x2e, 0x6c, 0x1a, 0x72, 0xea, + 0x41, 0x12, 0xc9, 0x7a, 0xf0, 0xa4, 0x6c, 0x74, 0xc5, 0xa5, 0x54, 0x4b, 0x04, 0x41, 0x2f, 0x21, + 0x49, 0x67, 0x27, 0x21, 0xdb, 0x99, 0xa1, 0x33, 0x51, 0xf3, 0x2d, 0xfc, 0x58, 0x7b, 0xdc, 0x8b, + 0xe0, 0xa9, 0x48, 0xfa, 0x45, 0x24, 0x93, 0x6e, 0xad, 0x15, 0xbd, 0xfd, 0xff, 0xff, 0xf7, 0xf8, + 0xbd, 0xf7, 0x98, 0x81, 0x93, 0x8c, 0x2f, 0x88, 0x4a, 0x2f, 0x95, 0xff, 0xf9, 0xc9, 0xe9, 0xd3, + 0xaf, 0xbe, 0x08, 0x84, 0x9f, 0x71, 0xc6, 0x3c, 0xb1, 0xe4, 0x8a, 0x63, 0x7c, 0x5b, 0xf6, 0x74, + 0xd9, 0x13, 0x81, 0x38, 0x7e, 0x48, 0x39, 0xe5, 0xba, 0xec, 0xb7, 0xaa, 0xeb, 0x3c, 0x76, 0xf6, + 0x40, 0xd9, 0xb2, 0x16, 0x8a, 0xfb, 0x25, 0xa9, 0x65, 0xd7, 0xe1, 0x0e, 0x00, 0x66, 0x49, 0x56, + 0x12, 0x35, 0x2b, 0x18, 0xdd, 0x71, 0x9c, 0x51, 0x37, 0x07, 0xab, 0x73, 0x53, 0x49, 0xf1, 0x63, + 0x80, 0x2c, 0x4f, 0x18, 0x23, 0x57, 0x71, 0x31, 0x1f, 0x22, 0x07, 0x8d, 0x0f, 0xc3, 0x7b, 0xcd, + 0x6a, 0x64, 0xbd, 0xec, 0xd2, 0x8b, 0x57, 0x91, 0xb5, 0x69, 0xb8, 0x98, 0xe3, 0x47, 0x60, 0x12, + 0x7e, 0x39, 0xbc, 0xe3, 0xa0, 0xf1, 0xdd, 0xf0, 0xa8, 0x59, 0x8d, 0xcc, 0xf3, 0x77, 0xaf, 0xa3, + 0x36, 0xc3, 0x18, 0x0e, 0xe6, 0x89, 0x4a, 0x86, 0xa6, 0x83, 0xc6, 0x83, 0x48, 0x6b, 0xf7, 0x3b, + 0x82, 0x5e, 0x37, 0x0a, 0x9f, 0x41, 0x5f, 0x68, 0x15, 0x8b, 0x82, 0x51, 0x3d, 0xa8, 0x1f, 0xd8, + 0xde, 0xdf, 0x27, 0x7b, 0xbf, 0xf7, 0x7e, 0x63, 0x44, 0x20, 0xb6, 0x6e, 0x17, 0xc1, 0x19, 0xd5, + 0x4b, 0xfc, 0x1f, 0xc1, 0xff, 0x40, 0x70, 0x46, 0xf1, 0x73, 0xd8, 0xb8, 0x78, 0x21, 0xa9, 0x5e, + 0xb5, 0x1f, 0x9c, 0xfc, 0x9b, 0x30, 0x95, 0x2d, 0xc0, 0x12, 0xb7, 0x26, 0x3c, 0x04, 0x53, 0x56, + 0x0b, 0x37, 0x83, 0xfb, 0x67, 0x95, 0xca, 0xdf, 0x17, 0x74, 0x4a, 0xa4, 0x4c, 0x28, 0xc1, 0x2f, + 0xe0, 0x48, 0x54, 0x69, 0x5c, 0x92, 0x7a, 0x73, 0x9a, 0xb3, 0x4f, 0xed, 0xde, 0xc8, 0x9b, 0x55, + 0xe9, 0x55, 0x91, 0x4d, 0x48, 0x1d, 0x1e, 0x5c, 0xaf, 0x46, 0x46, 0xd4, 0x13, 0x55, 0x3a, 0x21, + 0x35, 0x7e, 0x00, 0xa6, 0x2c, 0xba, 0xa3, 0x06, 0x51, 0x2b, 0xc3, 0xe8, 0xba, 0xb1, 0xd1, 0x4d, + 0x63, 0xa3, 0x9f, 0x8d, 0x8d, 0xbe, 0xad, 0x6d, 0xe3, 0x66, 0x6d, 0x1b, 0x3f, 0xd6, 0xb6, 0xf1, + 0xe9, 0x19, 0x2d, 0x54, 0x5e, 0xa5, 0xed, 0x04, 0x7f, 0xf2, 0xf1, 0xc3, 0xf9, 0x5b, 0xa2, 0xbe, + 0xf0, 0x65, 0xe9, 0xef, 0x7f, 0x2f, 0xfd, 0x6d, 0xb6, 0xa1, 0x08, 0x44, 0xda, 0xd3, 0xd9, 0xe9, + 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x84, 0x7c, 0xc2, 0x8a, 0x02, 0x00, 0x00, } func (m *PacketPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/conn.proto b/proto/cometbft/v034x/p2p/conn.proto similarity index 66% rename from proto/tendermint/p2p/conn.proto rename to proto/cometbft/v034x/p2p/conn.proto index b12de6c827d..5982fd69cd8 100644 --- a/proto/tendermint/p2p/conn.proto +++ b/proto/cometbft/v034x/p2p/conn.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v034x.p2p; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p"; import "gogoproto/gogo.proto"; -import "tendermint/crypto/keys.proto"; +import "cometbft/v034x/crypto/keys.proto"; message PacketPing {} @@ -25,6 +25,6 @@ message Packet { } message AuthSigMessage { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + cometbft.v034x.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; bytes sig = 2; } diff --git a/proto/tendermint/p2p/pex.go b/proto/cometbft/v034x/p2p/pex.go similarity index 100% rename from proto/tendermint/p2p/pex.go rename to proto/cometbft/v034x/p2p/pex.go diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/cometbft/v034x/p2p/pex.pb.go similarity index 87% rename from proto/tendermint/p2p/pex.pb.go rename to proto/cometbft/v034x/p2p/pex.pb.go index b4a39fe985f..9689e0bf840 100644 --- a/proto/tendermint/p2p/pex.pb.go +++ b/proto/cometbft/v034x/p2p/pex.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/pex.proto +// source: cometbft/v034x/p2p/pex.proto package p2p @@ -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_cb9a5045860bfbb5, []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_cb9a5045860bfbb5, []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_cb9a5045860bfbb5, []int{2} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,32 +189,33 @@ 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{ - // 268 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, 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, 0x8f, - 0x14, 0x66, 0xc8, 0xc1, 0x07, 0x0e, 0x29, 0xd4, 0xf0, 0x4c, 0x62, 0x03, 0x8b, 0x1a, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x3c, 0x0b, 0xcb, 0x40, 0x92, 0x01, 0x00, 0x00, + proto.RegisterType((*PexRequest)(nil), "cometbft.v034x.p2p.PexRequest") + proto.RegisterType((*PexAddrs)(nil), "cometbft.v034x.p2p.PexAddrs") + proto.RegisterType((*Message)(nil), "cometbft.v034x.p2p.Message") +} + +func init() { proto.RegisterFile("cometbft/v034x/p2p/pex.proto", fileDescriptor_cb9a5045860bfbb5) } + +var fileDescriptor_cb9a5045860bfbb5 = []byte{ + // 285 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, + 0x48, 0xad, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xc9, 0xea, 0x81, 0x65, 0xf5, + 0x0a, 0x8c, 0x0a, 0xa4, 0xe4, 0xb0, 0xe8, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0x86, 0xe8, 0x91, 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, 0x1b, 0x17, 0x47, 0x40, 0x6a, 0x85, + 0x63, 0x4a, 0x4a, 0x51, 0xb1, 0x90, 0x15, 0x17, 0x6b, 0x22, 0x88, 0x21, 0xc1, 0xa8, 0xc0, 0xac, + 0xc1, 0x6d, 0x24, 0xa7, 0x87, 0x69, 0xa7, 0x9e, 0x5f, 0x6a, 0x09, 0x48, 0x71, 0x6a, 0x71, 0xb1, + 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x10, 0x2d, 0x4a, 0x13, 0x18, 0xb9, 0xd8, 0x7d, 0x53, + 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0x1c, 0xb9, 0xb8, 0x0b, 0x52, 0x2b, 0xe2, 0x8b, 0x20, 0x56, + 0x48, 0x30, 0x2a, 0x30, 0xe2, 0x32, 0x0d, 0xe1, 0x10, 0x0f, 0x86, 0x20, 0xae, 0x02, 0x38, 0x4f, + 0xc8, 0x9a, 0x8b, 0x13, 0x64, 0x04, 0xc4, 0x39, 0x4c, 0x60, 0x03, 0x64, 0x70, 0x18, 0x00, 0x76, + 0xbb, 0x07, 0x43, 0x10, 0x47, 0x01, 0x94, 0xed, 0xc4, 0xca, 0xc5, 0x5c, 0x5c, 0x9a, 0xeb, 0x14, + 0x74, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, + 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x16, 0xe9, 0x99, 0x25, 0x19, + 0xa5, 0x49, 0x20, 0x03, 0xf5, 0xbd, 0x23, 0xc3, 0x5c, 0xfd, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, + 0xf5, 0xd1, 0xc3, 0x13, 0x1c, 0x74, 0x70, 0xc1, 0x02, 0xa3, 0x82, 0x24, 0x36, 0xb0, 0x98, 0x31, + 0x20, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x48, 0x4d, 0xfa, 0xad, 0x01, 0x00, 0x00, } func (m *PexRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/pex.proto b/proto/cometbft/v034x/p2p/pex.proto similarity index 63% rename from proto/tendermint/p2p/pex.proto rename to proto/cometbft/v034x/p2p/pex.proto index dfe238dbe60..7afa8b40ff7 100644 --- a/proto/tendermint/p2p/pex.proto +++ b/proto/cometbft/v034x/p2p/pex.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v034x.p2p; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p"; -import "tendermint/p2p/types.proto"; +import "cometbft/v034x/p2p/types.proto"; import "gogoproto/gogo.proto"; message PexRequest {} diff --git a/proto/tendermint/p2p/types.pb.go b/proto/cometbft/v034x/p2p/types.pb.go similarity index 89% rename from proto/tendermint/p2p/types.pb.go rename to proto/cometbft/v034x/p2p/types.pb.go index ed71161496d..359b9ed17f5 100644 --- a/proto/tendermint/p2p/types.pb.go +++ b/proto/cometbft/v034x/p2p/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/types.proto +// source: cometbft/v034x/p2p/types.proto package p2p @@ -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_a6c29aabdb9d4a34, []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_a6c29aabdb9d4a34, []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_a6c29aabdb9d4a34, []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_a6c29aabdb9d4a34, []int{3} } func (m *DefaultNodeInfoOther) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -296,46 +296,47 @@ 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.v034x.p2p.NetAddress") + proto.RegisterType((*ProtocolVersion)(nil), "cometbft.v034x.p2p.ProtocolVersion") + proto.RegisterType((*DefaultNodeInfo)(nil), "cometbft.v034x.p2p.DefaultNodeInfo") + proto.RegisterType((*DefaultNodeInfoOther)(nil), "cometbft.v034x.p2p.DefaultNodeInfoOther") } -func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } +func init() { proto.RegisterFile("cometbft/v034x/p2p/types.proto", fileDescriptor_a6c29aabdb9d4a34) } -var fileDescriptor_c8a29e659aeca578 = []byte{ - // 479 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, - 0x20, 0x39, 0x4a, 0x91, 0x2e, 0x21, 0x34, 0x34, 0x77, 0xd6, 0x2a, 0x4a, 0x91, 0xc6, 0x02, 0xef, - 0x1e, 0xac, 0x30, 0xbb, 0xab, 0xf5, 0x5e, 0x42, 0xfe, 0x45, 0x7e, 0xd6, 0x95, 0x57, 0xa6, 0xb2, - 0x22, 0x53, 0xe6, 0x4f, 0x44, 0x5e, 0xfb, 0x12, 0x1f, 0x4a, 0x37, 0x6f, 0xbe, 0xde, 0xcc, 0xd3, - 0x83, 0x91, 0xa6, 0x9c, 0x50, 0x75, 0x60, 0x5c, 0xcf, 0x65, 0x20, 0xe7, 0xfa, 0xbb, 0xa4, 0xe9, - 0x4c, 0x2a, 0xa1, 0x05, 0xba, 0xfc, 0x57, 0x9b, 0xc9, 0x40, 0x8e, 0x86, 0x5b, 0xb1, 0x15, 0xa6, - 0x34, 0x2f, 0xa2, 0xb2, 0x6b, 0x12, 0x02, 0xdc, 0x50, 0xfd, 0x81, 0x10, 0x45, 0xd3, 0x14, 0xbd, - 0x02, 0x9b, 0x11, 0xd7, 0x1a, 0x5b, 0xd3, 0x8b, 0x45, 0x3b, 0xcf, 0x7c, 0x7b, 0xb5, 0xc4, 0x36, - 0x23, 0x26, 0x2f, 0x5d, 0xbb, 0x96, 0x0f, 0xb1, 0xcd, 0x24, 0x42, 0xe0, 0x48, 0xa1, 0xb4, 0xdb, - 0x1c, 0x5b, 0xd3, 0x3e, 0x36, 0xf1, 0xe4, 0x13, 0x0c, 0xc2, 0x62, 0x75, 0x2c, 0x92, 0xcf, 0x54, - 0xa5, 0x4c, 0x70, 0x74, 0x0d, 0x4d, 0x19, 0x48, 0xb3, 0xd7, 0x59, 0x74, 0xf2, 0xcc, 0x6f, 0x86, - 0x41, 0x88, 0x8b, 0x1c, 0x1a, 0x42, 0x6b, 0x93, 0x88, 0x78, 0x6f, 0x96, 0x3b, 0xb8, 0x04, 0xe8, - 0x0a, 0x9a, 0x6b, 0x29, 0xcd, 0x5a, 0x07, 0x17, 0xe1, 0xe4, 0xb7, 0x0d, 0x83, 0x25, 0xbd, 0x5b, - 0xdf, 0x27, 0xfa, 0x46, 0x10, 0xba, 0xe2, 0x77, 0x02, 0x85, 0x70, 0x25, 0x2b, 0xa6, 0xe8, 0x6b, - 0x49, 0x65, 0x38, 0x7a, 0x81, 0x3f, 0x7b, 0xfe, 0xfc, 0xec, 0xec, 0xa2, 0x85, 0xf3, 0x90, 0xf9, - 0x0d, 0x3c, 0x90, 0x67, 0x87, 0xbe, 0x83, 0x01, 0x29, 0x49, 0x22, 0x2e, 0x08, 0x8d, 0x18, 0xa9, - 0x9e, 0x7e, 0x99, 0x67, 0x7e, 0xbf, 0xce, 0xbf, 0xc4, 0x7d, 0x52, 0x83, 0x04, 0xf9, 0xd0, 0x4b, - 0x58, 0xaa, 0x29, 0x8f, 0xd6, 0x84, 0x28, 0x73, 0xfa, 0x05, 0x86, 0x32, 0x55, 0xc8, 0x8b, 0x5c, - 0xe8, 0x70, 0xaa, 0xbf, 0x09, 0xb5, 0x77, 0x1d, 0x53, 0x7c, 0x82, 0x45, 0xe5, 0xe9, 0xfc, 0x56, - 0x59, 0xa9, 0x20, 0x1a, 0x41, 0x37, 0xde, 0xad, 0x39, 0xa7, 0x49, 0xea, 0xb6, 0xc7, 0xd6, 0xf4, - 0x05, 0xfe, 0x8b, 0x8b, 0xa9, 0x83, 0xe0, 0x6c, 0x4f, 0x95, 0xdb, 0x29, 0xa7, 0x2a, 0x88, 0xde, - 0x43, 0x4b, 0xe8, 0x1d, 0x55, 0x6e, 0xd7, 0x88, 0xf1, 0xfa, 0x5c, 0x8c, 0x33, 0x1d, 0x6f, 0x8b, - 0xde, 0x4a, 0x91, 0x72, 0x70, 0xb2, 0x81, 0xe1, 0xff, 0x9a, 0xd0, 0x35, 0x74, 0xf5, 0x31, 0x62, - 0x9c, 0xd0, 0x63, 0xe9, 0x12, 0xdc, 0xd1, 0xc7, 0x55, 0x01, 0xd1, 0x1c, 0x7a, 0x4a, 0xc6, 0xe6, - 0x79, 0x9a, 0xa6, 0x95, 0x6c, 0x97, 0x79, 0xe6, 0x03, 0x0e, 0x3f, 0x56, 0xfe, 0xc2, 0xa0, 0x64, - 0x5c, 0xc5, 0x8b, 0xdb, 0x87, 0xdc, 0xb3, 0x1e, 0x73, 0xcf, 0xfa, 0x95, 0x7b, 0xd6, 0x8f, 0x93, - 0xd7, 0x78, 0x3c, 0x79, 0x8d, 0x9f, 0x27, 0xaf, 0xf1, 0xe5, 0xed, 0x96, 0xe9, 0xdd, 0xfd, 0x66, - 0x16, 0x8b, 0xc3, 0xbc, 0x66, 0xf0, 0xba, 0xd7, 0x8d, 0x8d, 0x9f, 0x9b, 0x7f, 0xd3, 0x36, 0xd9, - 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x6c, 0xb3, 0x68, 0x97, 0x15, 0x03, 0x00, 0x00, +var fileDescriptor_a6c29aabdb9d4a34 = []byte{ + // 494 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x4d, 0x6f, 0xda, 0x40, + 0x10, 0xc5, 0xc6, 0x7c, 0x64, 0x28, 0x25, 0x5d, 0xa1, 0xca, 0xc9, 0xc1, 0x46, 0xf4, 0xc2, 0x09, + 0x57, 0x4e, 0x0f, 0xed, 0xb1, 0x94, 0x1e, 0x50, 0x25, 0x6a, 0xad, 0xa2, 0x48, 0xed, 0x05, 0x81, + 0x77, 0x01, 0x0b, 0xe2, 0x5d, 0xad, 0x37, 0x29, 0xfd, 0x17, 0xfd, 0x59, 0x39, 0xe6, 0xd8, 0x93, + 0x55, 0x99, 0x9f, 0xd0, 0x3f, 0x50, 0xed, 0xae, 0x89, 0x10, 0xcd, 0x6d, 0xde, 0x7b, 0x3b, 0x33, + 0x6f, 0x9f, 0x06, 0xbc, 0x98, 0xdd, 0x52, 0xb9, 0x58, 0xca, 0xe0, 0xfe, 0xed, 0xd5, 0xbb, 0x5d, + 0xc0, 0x43, 0x1e, 0xc8, 0x9f, 0x9c, 0x66, 0x43, 0x2e, 0x98, 0x64, 0x08, 0x1d, 0xf4, 0xa1, 0xd6, + 0x87, 0x3c, 0xe4, 0x97, 0xdd, 0x15, 0x5b, 0x31, 0x2d, 0x07, 0xaa, 0x32, 0x2f, 0xfb, 0x11, 0xc0, + 0x94, 0xca, 0x8f, 0x84, 0x08, 0x9a, 0x65, 0xe8, 0x35, 0xd8, 0x09, 0x71, 0xad, 0x9e, 0x35, 0x38, + 0x1b, 0xd5, 0x8b, 0xdc, 0xb7, 0x27, 0x63, 0x6c, 0x27, 0x44, 0xf3, 0xdc, 0xb5, 0x8f, 0xf8, 0x08, + 0xdb, 0x09, 0x47, 0x08, 0x1c, 0xce, 0x84, 0x74, 0xab, 0x3d, 0x6b, 0xd0, 0xc6, 0xba, 0xee, 0x5f, + 0x43, 0x27, 0x52, 0xa3, 0x63, 0xb6, 0xbd, 0xa1, 0x22, 0x4b, 0x58, 0x8a, 0x2e, 0xa0, 0xca, 0x43, + 0xae, 0xe7, 0x3a, 0xa3, 0x46, 0x91, 0xfb, 0xd5, 0x28, 0x8c, 0xb0, 0xe2, 0x50, 0x17, 0x6a, 0x8b, + 0x2d, 0x8b, 0x37, 0x7a, 0xb8, 0x83, 0x0d, 0x40, 0xe7, 0x50, 0x9d, 0x73, 0xae, 0xc7, 0x3a, 0x58, + 0x95, 0xfd, 0xbf, 0x36, 0x74, 0xc6, 0x74, 0x39, 0xbf, 0xdb, 0xca, 0x29, 0x23, 0x74, 0x92, 0x2e, + 0x19, 0xba, 0x86, 0x73, 0x5e, 0x6e, 0x9a, 0xdd, 0x9b, 0x55, 0x7a, 0x47, 0x2b, 0x7c, 0x33, 0xfc, + 0x3f, 0x80, 0xe1, 0x89, 0xab, 0x91, 0xf3, 0x90, 0xfb, 0x15, 0xdc, 0xe1, 0x27, 0x66, 0x3f, 0x40, + 0x87, 0x98, 0x45, 0xb3, 0x94, 0x11, 0x3a, 0x4b, 0x48, 0xf9, 0xf1, 0x57, 0x45, 0xee, 0xb7, 0x8f, + 0x3d, 0x8c, 0x71, 0x9b, 0x1c, 0x41, 0x82, 0x7c, 0x68, 0x6d, 0x93, 0x4c, 0xd2, 0x74, 0x36, 0x27, + 0x44, 0x68, 0xfb, 0x67, 0x18, 0x0c, 0xa5, 0x22, 0x46, 0x2e, 0x34, 0x52, 0x2a, 0x7f, 0x30, 0xb1, + 0x71, 0x1d, 0x2d, 0x1e, 0xa0, 0x52, 0x0e, 0x5f, 0xa8, 0x19, 0xa5, 0x84, 0xe8, 0x12, 0x9a, 0xf1, + 0x7a, 0x9e, 0xa6, 0x74, 0x9b, 0xb9, 0xf5, 0x9e, 0x35, 0x78, 0x81, 0x9f, 0xb0, 0xea, 0xba, 0x65, + 0x69, 0xb2, 0xa1, 0xc2, 0x6d, 0x98, 0xae, 0x12, 0xa2, 0x31, 0xd4, 0x98, 0x5c, 0x53, 0xe1, 0x36, + 0x75, 0x20, 0x83, 0xe7, 0x02, 0x39, 0xc9, 0xf3, 0xab, 0x7a, 0x5f, 0xa6, 0x62, 0x9a, 0xfb, 0x0b, + 0xe8, 0x3e, 0xf7, 0x08, 0x5d, 0x40, 0x53, 0xee, 0x66, 0x49, 0x4a, 0xe8, 0xce, 0x5c, 0x0b, 0x6e, + 0xc8, 0xdd, 0x44, 0x41, 0x14, 0x40, 0x4b, 0xf0, 0x58, 0x07, 0x40, 0xb3, 0xac, 0x8c, 0xee, 0x65, + 0x91, 0xfb, 0x80, 0xa3, 0x4f, 0xe5, 0x9d, 0x61, 0x10, 0x3c, 0x2e, 0xeb, 0x11, 0x7e, 0x28, 0x3c, + 0xeb, 0xb1, 0xf0, 0xac, 0x3f, 0x85, 0x67, 0xfd, 0xda, 0x7b, 0x95, 0xc7, 0xbd, 0x57, 0xf9, 0xbd, + 0xf7, 0x2a, 0xdf, 0xdf, 0xaf, 0x12, 0xb9, 0xbe, 0x5b, 0x28, 0xeb, 0xc1, 0x97, 0x6f, 0x37, 0x9f, + 0xa7, 0x26, 0xab, 0xe0, 0xf4, 0xf8, 0xf5, 0x4d, 0x3f, 0x91, 0x3c, 0xe4, 0x8b, 0xba, 0xe6, 0xae, + 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x76, 0x59, 0x4b, 0x28, 0x03, 0x00, 0x00, } func (m *NetAddress) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/types.proto b/proto/cometbft/v034x/p2p/types.proto similarity index 89% rename from proto/tendermint/p2p/types.proto rename to proto/cometbft/v034x/p2p/types.proto index 0d42ea40029..581e6409487 100644 --- a/proto/tendermint/p2p/types.proto +++ b/proto/cometbft/v034x/p2p/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v034x.p2p; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/privval/types.pb.go b/proto/cometbft/v034x/privval/types.pb.go similarity index 90% rename from proto/tendermint/privval/types.pb.go rename to proto/cometbft/v034x/privval/types.pb.go index ef28890c894..2a1cffb7824 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/cometbft/v034x/privval/types.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/privval/types.proto +// source: cometbft/v034x/privval/types.proto package privval import ( fmt "fmt" + crypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + types "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - types "github.com/tendermint/tendermint/proto/tendermint/types" 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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []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_b1e75e0599db9bc2, []int{9} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -662,70 +662,74 @@ 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{ - // 750 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0x13, 0x41, - 0x18, 0xde, 0x85, 0x7e, 0xc0, 0x5b, 0x5a, 0xca, 0x80, 0x58, 0x1a, 0x5c, 0x6a, 0x8d, 0x4a, 0x7a, - 0x68, 0x0d, 0x26, 0x26, 0x06, 0x2f, 0x02, 0x1b, 0xdb, 0x34, 0x6c, 0xeb, 0xb4, 0x08, 0x21, 0x31, - 0x9b, 0x7e, 0x8c, 0xcb, 0x06, 0xba, 0x3b, 0xee, 0x6c, 0x49, 0x7a, 0xf6, 0xe6, 0xc9, 0xc4, 0x3f, - 0xe1, 0xd9, 0x5f, 0xc1, 0x91, 0xa3, 0x27, 0x63, 0xe0, 0x8f, 0x98, 0xce, 0x4e, 0xb7, 0xdb, 0x2f, - 0xa2, 0xe1, 0xb6, 0xf3, 0xbe, 0xef, 0x3c, 0x1f, 0x33, 0xcf, 0x66, 0x40, 0x71, 0x89, 0xd5, 0x26, - 0x4e, 0xc7, 0xb4, 0xdc, 0x02, 0x75, 0xcc, 0xcb, 0xcb, 0xc6, 0x45, 0xc1, 0xed, 0x51, 0xc2, 0xf2, - 0xd4, 0xb1, 0x5d, 0x1b, 0xa1, 0x61, 0x3f, 0x2f, 0xfa, 0xe9, 0xcd, 0xc0, 0x9e, 0x96, 0xd3, 0xa3, - 0xae, 0x5d, 0x38, 0x27, 0x3d, 0xb1, 0x63, 0xa4, 0xcb, 0x91, 0x82, 0x78, 0xe9, 0x35, 0xc3, 0x36, - 0x6c, 0xfe, 0x59, 0xe8, 0x7f, 0x79, 0xd5, 0x6c, 0x09, 0x56, 0x30, 0xe9, 0xd8, 0x2e, 0xa9, 0x99, - 0x86, 0x45, 0x1c, 0xd5, 0x71, 0x6c, 0x07, 0x21, 0x08, 0xb5, 0xec, 0x36, 0x49, 0xc9, 0x19, 0x79, - 0x3b, 0x8c, 0xf9, 0x37, 0xca, 0x40, 0xac, 0x4d, 0x58, 0xcb, 0x31, 0xa9, 0x6b, 0xda, 0x56, 0x6a, - 0x2e, 0x23, 0x6f, 0x2f, 0xe2, 0x60, 0x29, 0x9b, 0x83, 0x78, 0xb5, 0xdb, 0x2c, 0x93, 0x1e, 0x26, - 0x9f, 0xbb, 0x84, 0xb9, 0x68, 0x03, 0x16, 0x5a, 0x67, 0x0d, 0xd3, 0xd2, 0xcd, 0x36, 0x87, 0x5a, - 0xc4, 0x51, 0xbe, 0x2e, 0xb5, 0xb3, 0x5f, 0x65, 0x48, 0x0c, 0x86, 0x19, 0xb5, 0x2d, 0x46, 0xd0, - 0x2e, 0x44, 0x69, 0xb7, 0xa9, 0x9f, 0x93, 0x1e, 0x1f, 0x8e, 0xed, 0x6c, 0xe6, 0x03, 0x27, 0xe0, - 0xb9, 0xcd, 0x57, 0xbb, 0xcd, 0x0b, 0xb3, 0x55, 0x26, 0xbd, 0xbd, 0xd0, 0xd5, 0xef, 0x2d, 0x09, - 0x47, 0x28, 0x07, 0x41, 0xbb, 0x10, 0x26, 0x7d, 0xe9, 0x5c, 0x57, 0x6c, 0xe7, 0x69, 0x7e, 0xf2, - 0xf0, 0xf2, 0x13, 0x3e, 0xb1, 0xb7, 0x27, 0x7b, 0x02, 0xcb, 0xfd, 0xea, 0x07, 0xdb, 0x25, 0x03, - 0xe9, 0x39, 0x08, 0x5d, 0xda, 0x2e, 0x11, 0x4a, 0xd6, 0x83, 0x70, 0xde, 0x99, 0xf2, 0x61, 0x3e, - 0x33, 0x62, 0x73, 0x6e, 0xd4, 0xe6, 0x17, 0x19, 0x10, 0x27, 0x6c, 0x7b, 0xe0, 0xc2, 0xea, 0x8b, - 0x7f, 0x41, 0x17, 0x0e, 0x3d, 0x8e, 0x7b, 0xf9, 0x3b, 0x83, 0xd5, 0x7e, 0xb5, 0xea, 0xd8, 0xd4, - 0x66, 0x8d, 0x8b, 0x81, 0xc7, 0x57, 0xb0, 0x40, 0x45, 0x49, 0x28, 0x49, 0x4f, 0x2a, 0xf1, 0x37, - 0xf9, 0xb3, 0x77, 0xf9, 0xfd, 0x2e, 0xc3, 0xba, 0xe7, 0x77, 0x48, 0x26, 0x3c, 0xbf, 0xf9, 0x1f, - 0x36, 0xe1, 0x7d, 0xc8, 0x79, 0x2f, 0xff, 0x71, 0x88, 0x55, 0x4d, 0xcb, 0x10, 0xbe, 0xb3, 0x09, - 0x58, 0xf2, 0x96, 0x9e, 0xb2, 0xec, 0xcf, 0x30, 0x44, 0x0f, 0x09, 0x63, 0x0d, 0x83, 0xa0, 0x32, - 0x2c, 0x8b, 0x10, 0xea, 0x8e, 0x37, 0x2e, 0xc4, 0x3e, 0x9e, 0xc6, 0x38, 0x12, 0xf7, 0xa2, 0x84, - 0xe3, 0x74, 0x24, 0xff, 0x1a, 0x24, 0x87, 0x60, 0x1e, 0x99, 0xd0, 0x9f, 0xbd, 0x0b, 0xcd, 0x9b, - 0x2c, 0x4a, 0x38, 0x41, 0x47, 0xff, 0x90, 0xf7, 0xb0, 0xc2, 0x4c, 0xc3, 0xd2, 0xfb, 0x89, 0xf0, - 0xe5, 0xcd, 0x73, 0xc0, 0x27, 0xd3, 0x00, 0xc7, 0x42, 0x5d, 0x94, 0xf0, 0x32, 0x1b, 0xcb, 0xf9, - 0x29, 0xac, 0x31, 0x7e, 0x5f, 0x03, 0x50, 0x21, 0x33, 0xc4, 0x51, 0x9f, 0xcd, 0x42, 0x1d, 0xcd, - 0x73, 0x51, 0xc2, 0x88, 0x4d, 0xa6, 0xfc, 0x23, 0x3c, 0xe0, 0x72, 0x07, 0x97, 0xe8, 0x4b, 0x0e, - 0x73, 0xf0, 0xe7, 0xb3, 0xc0, 0xc7, 0x72, 0x5a, 0x94, 0xf0, 0x2a, 0x9b, 0x12, 0xdf, 0x4f, 0x90, - 0x12, 0xd2, 0x03, 0x04, 0x42, 0x7e, 0x84, 0x33, 0xe4, 0x66, 0xcb, 0x1f, 0x8f, 0x67, 0x51, 0xc2, - 0xeb, 0x6c, 0x7a, 0x70, 0x0f, 0x60, 0x89, 0x9a, 0x96, 0xe1, 0xab, 0x8f, 0x72, 0xec, 0xad, 0xa9, - 0x37, 0x38, 0x4c, 0x59, 0x51, 0xc2, 0x31, 0x3a, 0x5c, 0xa2, 0x77, 0x10, 0x17, 0x28, 0x42, 0xe2, - 0x02, 0x87, 0xc9, 0xcc, 0x86, 0xf1, 0x85, 0x2d, 0xd1, 0xc0, 0x7a, 0x2f, 0x0c, 0xf3, 0xac, 0xdb, - 0xc9, 0xfd, 0x90, 0x21, 0xc2, 0x43, 0xce, 0x10, 0x82, 0x84, 0x8a, 0x71, 0x05, 0xd7, 0xf4, 0x23, - 0xad, 0xac, 0x55, 0x8e, 0xb5, 0xa4, 0x84, 0x14, 0x48, 0xfb, 0x35, 0xf5, 0xa4, 0xaa, 0xee, 0xd7, - 0xd5, 0x03, 0x1d, 0xab, 0xb5, 0x6a, 0x45, 0xab, 0xa9, 0x49, 0x19, 0xa5, 0x60, 0x4d, 0xf4, 0xb5, - 0x8a, 0xbe, 0x5f, 0xd1, 0x34, 0x75, 0xbf, 0x5e, 0xaa, 0x68, 0xc9, 0x39, 0xf4, 0x08, 0x36, 0x44, - 0x67, 0x58, 0xd6, 0xeb, 0xa5, 0x43, 0xb5, 0x72, 0x54, 0x4f, 0xce, 0xa3, 0x87, 0xb0, 0x2a, 0xda, - 0x58, 0x7d, 0x7b, 0xe0, 0x37, 0x42, 0x01, 0xc4, 0x63, 0x5c, 0xaa, 0xab, 0x7e, 0x27, 0xbc, 0x57, - 0xbb, 0xba, 0x51, 0xe4, 0xeb, 0x1b, 0x45, 0xfe, 0x73, 0xa3, 0xc8, 0xdf, 0x6e, 0x15, 0xe9, 0xfa, - 0x56, 0x91, 0x7e, 0xdd, 0x2a, 0xd2, 0xe9, 0x6b, 0xc3, 0x74, 0xcf, 0xba, 0xcd, 0x7c, 0xcb, 0xee, - 0x14, 0x82, 0x6f, 0x57, 0xf0, 0x61, 0xec, 0xbf, 0x57, 0x93, 0x2f, 0x65, 0x33, 0xc2, 0x3b, 0x2f, - 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x2a, 0xe5, 0x4a, 0x46, 0x07, 0x00, 0x00, + proto.RegisterEnum("cometbft.v034x.privval.Errors", Errors_name, Errors_value) + proto.RegisterType((*RemoteSignerError)(nil), "cometbft.v034x.privval.RemoteSignerError") + proto.RegisterType((*PubKeyRequest)(nil), "cometbft.v034x.privval.PubKeyRequest") + proto.RegisterType((*PubKeyResponse)(nil), "cometbft.v034x.privval.PubKeyResponse") + proto.RegisterType((*SignVoteRequest)(nil), "cometbft.v034x.privval.SignVoteRequest") + proto.RegisterType((*SignedVoteResponse)(nil), "cometbft.v034x.privval.SignedVoteResponse") + proto.RegisterType((*SignProposalRequest)(nil), "cometbft.v034x.privval.SignProposalRequest") + proto.RegisterType((*SignedProposalResponse)(nil), "cometbft.v034x.privval.SignedProposalResponse") + proto.RegisterType((*PingRequest)(nil), "cometbft.v034x.privval.PingRequest") + proto.RegisterType((*PingResponse)(nil), "cometbft.v034x.privval.PingResponse") + proto.RegisterType((*Message)(nil), "cometbft.v034x.privval.Message") +} + +func init() { + proto.RegisterFile("cometbft/v034x/privval/types.proto", fileDescriptor_b1e75e0599db9bc2) +} + +var fileDescriptor_b1e75e0599db9bc2 = []byte{ + // 772 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5b, 0x4f, 0xdb, 0x48, + 0x14, 0xb6, 0x21, 0x17, 0x38, 0x21, 0x21, 0x0c, 0x2c, 0x1b, 0x22, 0xad, 0x37, 0xca, 0xde, 0x58, + 0x56, 0x72, 0x56, 0xc0, 0xd3, 0x6a, 0x25, 0x76, 0x01, 0x4b, 0x8e, 0x22, 0xec, 0x68, 0x12, 0x60, + 0xb7, 0xaa, 0x6a, 0xe5, 0x32, 0x35, 0x2e, 0x21, 0xe3, 0x7a, 0x9c, 0xb4, 0xf9, 0x0d, 0x7d, 0xa9, + 0xfa, 0xda, 0x3f, 0xd0, 0x9f, 0xc2, 0x23, 0xea, 0x53, 0x9f, 0xaa, 0x0a, 0xfe, 0x48, 0x95, 0xf1, + 0xc4, 0xb9, 0x92, 0xb6, 0xe2, 0xcd, 0x73, 0xe6, 0x9c, 0xef, 0x72, 0xe6, 0x1c, 0x19, 0xf2, 0x0d, + 0x7a, 0x45, 0xfc, 0xfa, 0x53, 0xbf, 0xd0, 0xfd, 0x73, 0x6f, 0xff, 0x65, 0xc1, 0xf5, 0x9c, 0x6e, + 0xb7, 0xd6, 0x2a, 0xf8, 0x3d, 0x97, 0x30, 0xd5, 0xf5, 0xa8, 0x4f, 0xd1, 0xe6, 0x20, 0x47, 0xe5, + 0x39, 0xaa, 0xc8, 0xc9, 0xe6, 0x26, 0x6a, 0x1b, 0x5e, 0xcf, 0xf5, 0x69, 0xe1, 0x92, 0xf4, 0x44, + 0xe5, 0x54, 0x06, 0x47, 0x1d, 0xc5, 0xce, 0x6e, 0xd8, 0xd4, 0xa6, 0xfc, 0xb3, 0xd0, 0xff, 0x0a, + 0xa2, 0xf9, 0x22, 0xac, 0x61, 0x72, 0x45, 0x7d, 0x52, 0x71, 0xec, 0x36, 0xf1, 0x34, 0xcf, 0xa3, + 0x1e, 0x42, 0x10, 0x69, 0xd0, 0x26, 0xc9, 0xc8, 0x39, 0x79, 0x3b, 0x8a, 0xf9, 0x37, 0xca, 0x41, + 0xa2, 0x49, 0x58, 0xc3, 0x73, 0x5c, 0xdf, 0xa1, 0xed, 0xcc, 0x42, 0x4e, 0xde, 0x5e, 0xc6, 0xa3, + 0xa1, 0xfc, 0x0e, 0x24, 0xcb, 0x9d, 0x7a, 0x89, 0xf4, 0x30, 0x79, 0xde, 0x21, 0xcc, 0x47, 0x5b, + 0xb0, 0xd4, 0xb8, 0xa8, 0x39, 0x6d, 0xcb, 0x69, 0x72, 0xa8, 0x65, 0x1c, 0xe7, 0xe7, 0x62, 0x33, + 0xff, 0x46, 0x86, 0xd4, 0x20, 0x99, 0xb9, 0xb4, 0xcd, 0x08, 0x3a, 0x80, 0xb8, 0xdb, 0xa9, 0x5b, + 0x97, 0xa4, 0xc7, 0x93, 0x13, 0xbb, 0x39, 0x75, 0xa2, 0x1b, 0x81, 0x6b, 0xb5, 0xdc, 0xa9, 0xb7, + 0x9c, 0x46, 0x89, 0xf4, 0x0e, 0x23, 0xd7, 0x1f, 0x7f, 0x94, 0x70, 0xcc, 0xe5, 0x40, 0xe8, 0x00, + 0xa2, 0xa4, 0x2f, 0x9f, 0x6b, 0x4b, 0xec, 0xfe, 0xae, 0xce, 0x6e, 0xa6, 0x3a, 0xe5, 0x17, 0x07, + 0x75, 0xf9, 0xc7, 0xb0, 0xda, 0x8f, 0x9e, 0x51, 0x9f, 0x0c, 0x2c, 0xa8, 0x10, 0xe9, 0x52, 0x9f, + 0x08, 0x45, 0xd9, 0x49, 0xc8, 0xa0, 0xbf, 0xbc, 0x80, 0xe7, 0x8d, 0x59, 0x5e, 0x18, 0xb7, 0xfc, + 0x4a, 0x06, 0xc4, 0x49, 0x9b, 0x01, 0x81, 0xb0, 0xbd, 0xff, 0xb5, 0x0c, 0xc2, 0x6d, 0xc0, 0xf3, + 0x60, 0xaf, 0x2d, 0x58, 0xef, 0x47, 0xcb, 0x1e, 0x75, 0x29, 0xab, 0xb5, 0x06, 0x7e, 0xff, 0x82, + 0x25, 0x57, 0x84, 0x84, 0x22, 0x65, 0xb6, 0xa2, 0xb0, 0x30, 0xcc, 0x9f, 0xe7, 0xfd, 0xad, 0x0c, + 0x9b, 0x81, 0xf7, 0x21, 0xa1, 0xf0, 0xff, 0xcf, 0xb7, 0x32, 0x8a, 0x3e, 0x0c, 0x79, 0x1f, 0xdc, + 0x8b, 0x24, 0x24, 0xca, 0x4e, 0xdb, 0x16, 0x3d, 0xc8, 0xa7, 0x60, 0x25, 0x38, 0x06, 0x0a, 0xf3, + 0xef, 0xa3, 0x10, 0x3f, 0x21, 0x8c, 0xd5, 0x6c, 0x82, 0x4c, 0x58, 0x15, 0x43, 0x6a, 0x79, 0x41, + 0xba, 0x10, 0xfd, 0xcb, 0x7d, 0xac, 0x63, 0x2b, 0xa1, 0x4b, 0x38, 0xe9, 0x8e, 0xed, 0x08, 0x86, + 0xf4, 0x10, 0x30, 0x20, 0x14, 0x3e, 0x7e, 0xfd, 0x12, 0x62, 0x90, 0xad, 0x4b, 0x38, 0xe5, 0x8e, + 0x6f, 0xd2, 0x29, 0xac, 0x31, 0xc7, 0x6e, 0x5b, 0xfd, 0x49, 0x09, 0x65, 0x2e, 0x72, 0xd0, 0xdf, + 0xee, 0x03, 0x9d, 0x18, 0x7c, 0x5d, 0xc2, 0xab, 0x6c, 0x62, 0x17, 0x9e, 0xc0, 0x06, 0xe3, 0x6f, + 0x38, 0x00, 0x16, 0x72, 0x23, 0x1c, 0x79, 0x67, 0x1e, 0xf2, 0xf8, 0xcc, 0xeb, 0x12, 0x46, 0x6c, + 0x7a, 0x13, 0x6a, 0xf0, 0x1d, 0x97, 0x3d, 0x78, 0xd8, 0x50, 0x7a, 0x94, 0x13, 0xfc, 0x31, 0x8f, + 0x60, 0x62, 0x8e, 0x75, 0x09, 0xaf, 0xb3, 0x19, 0xe3, 0xfd, 0x0c, 0x32, 0xc2, 0xc2, 0x08, 0x89, + 0xb0, 0x11, 0xe3, 0x2c, 0xea, 0x7c, 0x1b, 0x93, 0xe3, 0xab, 0x4b, 0x78, 0x93, 0xcd, 0x1e, 0x6c, + 0x1d, 0x56, 0x5c, 0xa7, 0x6d, 0x87, 0x2e, 0xe2, 0x1c, 0xff, 0xa7, 0x7b, 0x5f, 0x75, 0x38, 0x81, + 0xba, 0x84, 0x13, 0xee, 0xf0, 0x88, 0x4a, 0x90, 0x14, 0x48, 0x42, 0xea, 0x12, 0x87, 0xfa, 0x79, + 0x3e, 0x54, 0x28, 0x70, 0xc5, 0x1d, 0x39, 0x1f, 0x46, 0x61, 0x91, 0x75, 0xae, 0x76, 0xde, 0xc9, + 0x10, 0xe3, 0x4b, 0xc0, 0x10, 0x82, 0x94, 0x86, 0xb1, 0x89, 0x2b, 0xd6, 0xa9, 0x51, 0x32, 0xcc, + 0x73, 0x23, 0x2d, 0x21, 0x05, 0xb2, 0x61, 0x4c, 0xfb, 0xaf, 0xac, 0x1d, 0x55, 0xb5, 0x63, 0x0b, + 0x6b, 0x95, 0xb2, 0x69, 0x54, 0xb4, 0xb4, 0x8c, 0x32, 0xb0, 0x21, 0xee, 0x0d, 0xd3, 0x3a, 0x32, + 0x0d, 0x43, 0x3b, 0xaa, 0x16, 0x4d, 0x23, 0xbd, 0x80, 0x7e, 0x80, 0x2d, 0x71, 0x33, 0x0c, 0x5b, + 0xd5, 0xe2, 0x89, 0x66, 0x9e, 0x56, 0xd3, 0x8b, 0xe8, 0x7b, 0x58, 0x17, 0xd7, 0x58, 0xfb, 0xf7, + 0x38, 0xbc, 0x88, 0x8c, 0x20, 0x9e, 0xe3, 0x62, 0x55, 0x0b, 0x6f, 0xa2, 0x87, 0x67, 0xd7, 0xb7, + 0x8a, 0x7c, 0x73, 0xab, 0xc8, 0x9f, 0x6e, 0x15, 0xf9, 0xf5, 0x9d, 0x22, 0xdd, 0xdc, 0x29, 0xd2, + 0x87, 0x3b, 0x45, 0x7a, 0xf4, 0xb7, 0xed, 0xf8, 0x17, 0x9d, 0x7a, 0xbf, 0x0f, 0x85, 0xd2, 0xff, + 0x67, 0x9a, 0x41, 0xfc, 0x17, 0xd4, 0xbb, 0x2c, 0x4c, 0xfd, 0x69, 0xfb, 0x3f, 0xbd, 0x30, 0x28, + 0xda, 0x54, 0x8f, 0xf1, 0xf8, 0xde, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x17, 0x54, 0x0a, 0x82, + 0x99, 0x07, 0x00, 0x00, } func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/privval/types.proto b/proto/cometbft/v034x/privval/types.proto similarity index 77% rename from proto/tendermint/privval/types.proto rename to proto/cometbft/v034x/privval/types.proto index 0fc8b61dc93..a7aa997ceaf 100644 --- a/proto/tendermint/privval/types.proto +++ b/proto/cometbft/v034x/privval/types.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.privval; +package cometbft.v034x.privval; -import "tendermint/crypto/keys.proto"; -import "tendermint/types/types.proto"; +import "cometbft/v034x/crypto/keys.proto"; +import "cometbft/v034x/types/types.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/privval"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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.v034x.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.v034x.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.v034x.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.v034x.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.v034x.types.Proposal proposal = 1 [(gogoproto.nullable) = false]; RemoteSignerError error = 2; } diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/cometbft/v034x/rpc/grpc/types.pb.go similarity index 86% rename from proto/tendermint/rpc/grpc/types.pb.go rename to proto/cometbft/v034x/rpc/grpc/types.pb.go index b9cbee03fc8..7d3aa2f175a 100644 --- a/proto/tendermint/rpc/grpc/types.pb.go +++ b/proto/cometbft/v034x/rpc/grpc/types.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/rpc/grpc/types.proto +// source: cometbft/v034x/rpc/grpc/types.proto package coregrpc import ( context "context" fmt "fmt" + types "github.com/KYVENetwork/cometbft/v034x/abci/types" proto "github.com/gogo/protobuf/proto" - types "github.com/tendermint/tendermint/abci/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -34,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_a5cc8f27d1b439b2, []int{0} } func (m *RequestPing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -71,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_a5cc8f27d1b439b2, []int{1} } func (m *RequestBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,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_a5cc8f27d1b439b2, []int{2} } func (m *ResponsePing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -152,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_a5cc8f27d1b439b2, []int{3} } func (m *ResponseBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -196,36 +196,39 @@ func (m *ResponseBroadcastTx) GetDeliverTx() *types.ResponseDeliverTx { } 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{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, 0x25, 0x95, - 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x05, 0x7a, 0x45, 0x05, - 0xc9, 0x7a, 0x20, 0x05, 0x52, 0xd2, 0x48, 0xba, 0x12, 0x93, 0x92, 0x33, 0x91, 0x75, 0x28, 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, 0x53, 0x19, 0xb9, 0x84, - 0x61, 0x02, 0xc8, 0xfa, 0xac, 0xb9, 0x38, 0x92, 0x33, 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, - 0x8d, 0x14, 0xf4, 0x90, 0x5c, 0x08, 0x72, 0x8c, 0x1e, 0x4c, 0x9f, 0x33, 0x48, 0x61, 0x48, 0x45, - 0x10, 0x7b, 0x32, 0x84, 0x21, 0xe4, 0xc8, 0xc5, 0x95, 0x92, 0x9a, 0x93, 0x59, 0x96, 0x5a, 0x04, - 0xd2, 0xce, 0x04, 0xd6, 0xae, 0x84, 0x53, 0xbb, 0x0b, 0x44, 0x69, 0x48, 0x45, 0x10, 0x67, 0x0a, - 0x8c, 0x69, 0xb4, 0x97, 0x91, 0x8b, 0x07, 0xee, 0x1e, 0xc7, 0x00, 0x4f, 0x21, 0x6f, 0x2e, 0x16, - 0x90, 0x83, 0x85, 0x50, 0x9c, 0x01, 0x0b, 0x28, 0x3d, 0xa4, 0x80, 0x90, 0x52, 0xc4, 0xa1, 0x02, - 0xe1, 0x6b, 0xa1, 0x04, 0x2e, 0x6e, 0x64, 0xcf, 0xaa, 0xe3, 0x33, 0x13, 0x49, 0xa1, 0x94, 0x06, - 0x5e, 0xa3, 0x91, 0x54, 0x3a, 0xf9, 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, 0x51, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x52, 0xf4, 0x62, - 0x49, 0x1f, 0xd6, 0xc9, 0xf9, 0x45, 0xa9, 0x20, 0x46, 0x12, 0x1b, 0x38, 0xc6, 0x8d, 0x01, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf6, 0x4b, 0x02, 0xd8, 0x46, 0x02, 0x00, 0x00, + proto.RegisterType((*RequestPing)(nil), "cometbft.v034x.rpc.grpc.RequestPing") + proto.RegisterType((*RequestBroadcastTx)(nil), "cometbft.v034x.rpc.grpc.RequestBroadcastTx") + proto.RegisterType((*ResponsePing)(nil), "cometbft.v034x.rpc.grpc.ResponsePing") + proto.RegisterType((*ResponseBroadcastTx)(nil), "cometbft.v034x.rpc.grpc.ResponseBroadcastTx") +} + +func init() { + proto.RegisterFile("cometbft/v034x/rpc/grpc/types.proto", fileDescriptor_a5cc8f27d1b439b2) +} + +var fileDescriptor_a5cc8f27d1b439b2 = []byte{ + // 331 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, + 0x07, 0x11, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xe2, 0x30, + 0x45, 0x7a, 0x60, 0x45, 0x7a, 0x45, 0x05, 0xc9, 0x7a, 0x20, 0x45, 0x52, 0xf2, 0x68, 0xba, 0x13, + 0x93, 0x92, 0x33, 0x91, 0x75, 0x2a, 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, 0x73, 0x19, 0xb9, 0x84, 0x61, 0x02, 0xc8, 0xfa, 0xec, 0xb9, 0x38, 0x92, 0x33, + 0x52, 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, 0x8d, 0x54, 0xf4, 0xd0, 0x5c, 0x0a, 0x72, 0x90, 0x1e, + 0x4c, 0xaf, 0x33, 0x48, 0x71, 0x48, 0x45, 0x10, 0x7b, 0x32, 0x84, 0x21, 0xe4, 0xca, 0xc5, 0x95, + 0x92, 0x9a, 0x93, 0x59, 0x96, 0x5a, 0x04, 0x32, 0x82, 0x09, 0x6c, 0x84, 0x1a, 0x5e, 0x23, 0x5c, + 0x20, 0xca, 0x43, 0x2a, 0x82, 0x38, 0x53, 0x60, 0x4c, 0xa3, 0xb3, 0x8c, 0x5c, 0x3c, 0x70, 0x77, + 0x39, 0x06, 0x78, 0x0a, 0x05, 0x73, 0xb1, 0x80, 0x1c, 0x2e, 0x84, 0xe1, 0x1c, 0x58, 0xc0, 0xe9, + 0x21, 0x05, 0x8a, 0x94, 0x2a, 0x1e, 0x55, 0x88, 0x50, 0x10, 0xca, 0xe0, 0xe2, 0x46, 0xf6, 0xbc, + 0x36, 0x21, 0xb3, 0x91, 0x14, 0x4b, 0xe9, 0x10, 0xb4, 0x02, 0x49, 0xb5, 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, 0x81, + 0x4c, 0xd3, 0xf7, 0x8e, 0x0c, 0x73, 0xf5, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0xc7, 0x91, + 0x88, 0xac, 0x93, 0xf3, 0x8b, 0x52, 0x41, 0x8c, 0x24, 0x36, 0x70, 0x72, 0x30, 0x06, 0x04, 0x00, + 0x00, 0xff, 0xff, 0x52, 0x53, 0xd1, 0xbb, 0x6f, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -254,7 +257,7 @@ func NewBroadcastAPIClient(cc *grpc.ClientConn) BroadcastAPIClient { 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.v034x.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) if err != nil { return nil, err } @@ -263,7 +266,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.v034x.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) if err != nil { return nil, err } @@ -301,7 +304,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.v034x.rpc.grpc.BroadcastAPI/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).Ping(ctx, req.(*RequestPing)) @@ -319,7 +322,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", + FullMethod: "/cometbft.v034x.rpc.grpc.BroadcastAPI/BroadcastTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).BroadcastTx(ctx, req.(*RequestBroadcastTx)) @@ -328,7 +331,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.rpc.grpc.BroadcastAPI", + ServiceName: "cometbft.v034x.rpc.grpc.BroadcastAPI", HandlerType: (*BroadcastAPIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -341,7 +344,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/rpc/grpc/types.proto", + Metadata: "cometbft/v034x/rpc/grpc/types.proto", } func (m *RequestPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/rpc/grpc/types.proto b/proto/cometbft/v034x/rpc/grpc/types.proto similarity index 64% rename from proto/tendermint/rpc/grpc/types.proto rename to proto/cometbft/v034x/rpc/grpc/types.proto index ee948a40652..854f05796ce 100644 --- a/proto/tendermint/rpc/grpc/types.proto +++ b/proto/cometbft/v034x/rpc/grpc/types.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package tendermint.rpc.grpc; -option go_package = "github.com/tendermint/tendermint/rpc/grpc;coregrpc"; +package cometbft.v034x.rpc.grpc; +option go_package = "github.com/KYVENetwork/cometbft/v034x/rpc/grpc;coregrpc"; -import "tendermint/abci/types.proto"; +import "cometbft/v034x/abci/types.proto"; //---------------------------------------- // Request types @@ -19,8 +19,8 @@ message RequestBroadcastTx { message ResponsePing {} message ResponseBroadcastTx { - tendermint.abci.ResponseCheckTx check_tx = 1; - tendermint.abci.ResponseDeliverTx deliver_tx = 2; + cometbft.v034x.abci.ResponseCheckTx check_tx = 1; + cometbft.v034x.abci.ResponseDeliverTx deliver_tx = 2; } //---------------------------------------- diff --git a/proto/tendermint/state/types.pb.go b/proto/cometbft/v034x/state/types.pb.go similarity index 88% rename from proto/tendermint/state/types.pb.go rename to proto/cometbft/v034x/state/types.pb.go index 6b57ca1ae8c..7a822b8648e 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/cometbft/v034x/state/types.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/state/types.proto +// source: cometbft/v034x/state/types.proto package state import ( fmt "fmt" + types "github.com/KYVENetwork/cometbft/v034x/abci/types" + types1 "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + version "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/tendermint/tendermint/abci/types" - types1 "github.com/tendermint/tendermint/proto/tendermint/types" - version "github.com/tendermint/tendermint/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -43,7 +43,7 @@ func (m *ABCIResponses) Reset() { *m = ABCIResponses{} } func (m *ABCIResponses) String() string { return proto.CompactTextString(m) } func (*ABCIResponses) ProtoMessage() {} func (*ABCIResponses) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{0} + return fileDescriptor_68918419eaeec432, []int{0} } func (m *ABCIResponses) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -103,7 +103,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{1} + return fileDescriptor_68918419eaeec432, []int{1} } func (m *ValidatorsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -156,7 +156,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{2} + return fileDescriptor_68918419eaeec432, []int{2} } func (m *ConsensusParamsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -208,7 +208,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{3} + return fileDescriptor_68918419eaeec432, []int{3} } func (m *ABCIResponsesInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -260,7 +260,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{4} + return fileDescriptor_68918419eaeec432, []int{4} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -336,7 +336,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{5} + return fileDescriptor_68918419eaeec432, []int{5} } func (m *State) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -464,69 +464,70 @@ func (m *State) GetAppHash() []byte { } func init() { - proto.RegisterType((*ABCIResponses)(nil), "tendermint.state.ABCIResponses") - 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{ - // 805 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x8e, 0xe3, 0x44, - 0x10, 0x8e, 0xc9, 0x6e, 0x7e, 0xca, 0x93, 0x64, 0xb7, 0x07, 0x21, 0x6f, 0x96, 0x75, 0xb2, 0xe1, - 0x47, 0x23, 0x0e, 0x8e, 0xb4, 0x1c, 0x10, 0x97, 0x95, 0xd6, 0x09, 0xb0, 0x91, 0x56, 0x08, 0x3c, - 0xa3, 0x39, 0x70, 0xb1, 0x3a, 0x71, 0x8f, 0x6d, 0x91, 0xd8, 0x96, 0xbb, 0x13, 0x86, 0x07, 0xe0, - 0x3e, 0x57, 0xde, 0x68, 0x8e, 0x73, 0x44, 0x1c, 0x06, 0xc8, 0xbc, 0x08, 0xea, 0x1f, 0xdb, 0x9d, - 0x84, 0x91, 0x06, 0xed, 0xad, 0x5d, 0xf5, 0xd5, 0x57, 0x5f, 0x55, 0x57, 0xb5, 0xe1, 0x63, 0x46, - 0x92, 0x80, 0xe4, 0xab, 0x38, 0x61, 0x63, 0xca, 0x30, 0x23, 0x63, 0xf6, 0x6b, 0x46, 0xa8, 0x93, - 0xe5, 0x29, 0x4b, 0xd1, 0x93, 0xca, 0xeb, 0x08, 0x6f, 0xff, 0xc3, 0x30, 0x0d, 0x53, 0xe1, 0x1c, - 0xf3, 0x93, 0xc4, 0xf5, 0x9f, 0x6b, 0x2c, 0x78, 0xbe, 0x88, 0x75, 0x92, 0xbe, 0x9e, 0x42, 0xd8, - 0x77, 0xbc, 0xc3, 0x03, 0xef, 0x06, 0x2f, 0xe3, 0x00, 0xb3, 0x34, 0x57, 0x88, 0x17, 0x07, 0x88, - 0x0c, 0xe7, 0x78, 0x55, 0x10, 0xd8, 0x9a, 0x7b, 0x43, 0x72, 0x1a, 0xa7, 0xc9, 0x4e, 0x82, 0x41, - 0x98, 0xa6, 0xe1, 0x92, 0x8c, 0xc5, 0xd7, 0x7c, 0x7d, 0x31, 0x66, 0xf1, 0x8a, 0x50, 0x86, 0x57, - 0x99, 0x04, 0x8c, 0xfe, 0x34, 0xa0, 0xf3, 0xc6, 0x9d, 0xcc, 0x3c, 0x42, 0xb3, 0x34, 0xa1, 0x84, - 0xa2, 0x09, 0x98, 0x01, 0x59, 0xc6, 0x1b, 0x92, 0xfb, 0xec, 0x92, 0x5a, 0xc6, 0xb0, 0x7e, 0x62, - 0xbe, 0x1a, 0x39, 0x5a, 0x33, 0x78, 0x91, 0x4e, 0x11, 0x30, 0x95, 0xd8, 0xb3, 0x4b, 0x0f, 0x82, - 0xe2, 0x48, 0xd1, 0x6b, 0x68, 0x93, 0x24, 0xf0, 0xe7, 0xcb, 0x74, 0xf1, 0xb3, 0xf5, 0xc1, 0xd0, - 0x38, 0x31, 0x5f, 0xbd, 0xbc, 0x97, 0xe2, 0x9b, 0x24, 0x70, 0x39, 0xd0, 0x6b, 0x11, 0x75, 0x42, - 0x53, 0x30, 0xe7, 0x24, 0x8c, 0x13, 0xc5, 0x50, 0x17, 0x0c, 0x9f, 0xdc, 0xcb, 0xe0, 0x72, 0xac, - 0xe4, 0x80, 0x79, 0x79, 0x1e, 0xfd, 0x66, 0x40, 0xf7, 0xbc, 0x68, 0x28, 0x9d, 0x25, 0x17, 0x29, - 0x9a, 0x40, 0xa7, 0x6c, 0xb1, 0x4f, 0x09, 0xb3, 0x0c, 0x41, 0x6d, 0xeb, 0xd4, 0xb2, 0x81, 0x65, - 0xe0, 0x29, 0x61, 0xde, 0xd1, 0x46, 0xfb, 0x42, 0x0e, 0x1c, 0x2f, 0x31, 0x65, 0x7e, 0x44, 0xe2, - 0x30, 0x62, 0xfe, 0x22, 0xc2, 0x49, 0x48, 0x02, 0x51, 0x67, 0xdd, 0x7b, 0xca, 0x5d, 0x6f, 0x85, - 0x67, 0x22, 0x1d, 0xa3, 0xdf, 0x0d, 0x38, 0x9e, 0x70, 0x9d, 0x09, 0x5d, 0xd3, 0x1f, 0xc4, 0xfd, - 0x09, 0x31, 0x1e, 0x3c, 0x59, 0x14, 0x66, 0x5f, 0xde, 0xab, 0xd2, 0xf3, 0xf2, 0x50, 0xcf, 0x1e, - 0x81, 0xfb, 0xe8, 0xfa, 0x76, 0x50, 0xf3, 0x7a, 0x8b, 0x5d, 0xf3, 0xff, 0xd6, 0x46, 0xe1, 0xe9, - 0xce, 0xfd, 0x0b, 0x61, 0xdf, 0x42, 0x97, 0xf7, 0xd7, 0xcf, 0x0b, 0xab, 0x92, 0x35, 0x70, 0xf6, - 0x77, 0xc2, 0xd9, 0x09, 0xf6, 0x3a, 0x3c, 0xac, 0x9a, 0xa5, 0x8f, 0xa0, 0x21, 0x75, 0xa8, 0xfc, - 0xea, 0x6b, 0x14, 0x41, 0xf3, 0x5c, 0x4e, 0x2b, 0x7a, 0x03, 0xed, 0xb2, 0x04, 0x95, 0xe5, 0x85, - 0x9e, 0x45, 0x4d, 0x75, 0x55, 0xbe, 0x2a, 0xbc, 0x8a, 0x42, 0x7d, 0x68, 0xd1, 0xf4, 0x82, 0xfd, - 0x82, 0x73, 0x22, 0xf2, 0xb4, 0xbd, 0xf2, 0x7b, 0xf4, 0x4f, 0x03, 0x1e, 0x9f, 0x72, 0xa1, 0xe8, - 0x6b, 0x68, 0x2a, 0x2e, 0x95, 0xe6, 0xd9, 0x61, 0x31, 0x4a, 0x94, 0x4a, 0x51, 0xe0, 0xd1, 0xe7, - 0xd0, 0x5a, 0x44, 0x38, 0x4e, 0xfc, 0x58, 0x36, 0xb2, 0xed, 0x9a, 0xdb, 0xdb, 0x41, 0x73, 0xc2, - 0x6d, 0xb3, 0xa9, 0xd7, 0x14, 0xce, 0x59, 0x80, 0x3e, 0x83, 0x6e, 0x9c, 0xc4, 0x2c, 0xc6, 0x4b, - 0xd5, 0x7e, 0xab, 0x2b, 0xca, 0xee, 0x28, 0xab, 0xec, 0x3c, 0xfa, 0x02, 0xc4, 0x3d, 0xc8, 0xd9, - 0x2e, 0x90, 0x75, 0x81, 0xec, 0x71, 0x87, 0x18, 0x5e, 0x85, 0xf5, 0xa0, 0xa3, 0x61, 0xe3, 0xc0, - 0x7a, 0x74, 0xa8, 0x5d, 0xce, 0x87, 0x88, 0x9a, 0x4d, 0xdd, 0x63, 0xae, 0x7d, 0x7b, 0x3b, 0x30, - 0xdf, 0x15, 0x54, 0xb3, 0xa9, 0x67, 0x96, 0xbc, 0xb3, 0x00, 0xbd, 0x83, 0x9e, 0xc6, 0xc9, 0x5f, - 0x04, 0xeb, 0xb1, 0x60, 0xed, 0x3b, 0xf2, 0xb9, 0x70, 0x8a, 0xe7, 0xc2, 0x39, 0x2b, 0x9e, 0x0b, - 0xb7, 0xc5, 0x69, 0xaf, 0xfe, 0x1a, 0x18, 0x5e, 0xa7, 0xe4, 0xe2, 0x5e, 0xf4, 0x1d, 0xf4, 0x12, - 0x72, 0xc9, 0xfc, 0x72, 0x43, 0xa8, 0xd5, 0x78, 0xd0, 0x4e, 0x75, 0x79, 0x58, 0xb5, 0x9e, 0xe8, - 0x35, 0x80, 0xc6, 0xd1, 0x7c, 0x10, 0x87, 0x16, 0xc1, 0x85, 0x88, 0xb2, 0x34, 0x92, 0xd6, 0xc3, - 0x84, 0xf0, 0x30, 0x4d, 0xc8, 0x04, 0x6c, 0x7d, 0x85, 0x2a, 0xbe, 0x72, 0x9b, 0xda, 0xe2, 0xb2, - 0x9e, 0x57, 0xdb, 0x54, 0x45, 0xab, 0xbd, 0xfa, 0xcf, 0xdd, 0x86, 0xf7, 0xdc, 0xed, 0xef, 0xe1, - 0xd3, 0x9d, 0xdd, 0xde, 0xe3, 0x2f, 0xe5, 0x99, 0x42, 0xde, 0x50, 0x5b, 0xf6, 0x5d, 0xa2, 0x42, - 0x63, 0x31, 0x88, 0x39, 0xa1, 0xeb, 0x25, 0xa3, 0x7e, 0x84, 0x69, 0x64, 0x1d, 0x0d, 0x8d, 0x93, - 0x23, 0x39, 0x88, 0x9e, 0xb4, 0xbf, 0xc5, 0x34, 0x42, 0xcf, 0xa0, 0x85, 0xb3, 0x4c, 0x42, 0x3a, - 0x02, 0xd2, 0xc4, 0x59, 0xc6, 0x5d, 0xee, 0x8f, 0xd7, 0x5b, 0xdb, 0xb8, 0xd9, 0xda, 0xc6, 0xdf, - 0x5b, 0xdb, 0xb8, 0xba, 0xb3, 0x6b, 0x37, 0x77, 0x76, 0xed, 0x8f, 0x3b, 0xbb, 0xf6, 0xd3, 0x57, - 0x61, 0xcc, 0xa2, 0xf5, 0xdc, 0x59, 0xa4, 0xab, 0xb1, 0xfe, 0x23, 0xab, 0x8e, 0xf2, 0x6f, 0xba, - 0xff, 0x1f, 0x9e, 0x37, 0x84, 0xfd, 0xcb, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x1a, 0xb9, - 0x2e, 0xa2, 0x07, 0x00, 0x00, + proto.RegisterType((*ABCIResponses)(nil), "cometbft.v034x.state.ABCIResponses") + proto.RegisterType((*ValidatorsInfo)(nil), "cometbft.v034x.state.ValidatorsInfo") + proto.RegisterType((*ConsensusParamsInfo)(nil), "cometbft.v034x.state.ConsensusParamsInfo") + proto.RegisterType((*ABCIResponsesInfo)(nil), "cometbft.v034x.state.ABCIResponsesInfo") + proto.RegisterType((*Version)(nil), "cometbft.v034x.state.Version") + proto.RegisterType((*State)(nil), "cometbft.v034x.state.State") +} + +func init() { proto.RegisterFile("cometbft/v034x/state/types.proto", fileDescriptor_68918419eaeec432) } + +var fileDescriptor_68918419eaeec432 = []byte{ + // 828 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xdb, 0x46, + 0x10, 0x36, 0xeb, 0xc4, 0x92, 0x86, 0x96, 0xdc, 0xac, 0x83, 0x82, 0x55, 0x51, 0x49, 0x51, 0xe3, + 0xd4, 0xe8, 0x81, 0x2c, 0x92, 0x9e, 0x0a, 0xf4, 0x50, 0x4a, 0x46, 0xac, 0x26, 0x08, 0x0a, 0xc6, + 0x10, 0xd0, 0x5e, 0x88, 0xa5, 0xb8, 0x22, 0x89, 0x50, 0x24, 0xc1, 0x5d, 0xc9, 0xea, 0x23, 0xf4, + 0x96, 0x17, 0xe8, 0xfb, 0xe4, 0x98, 0x63, 0x4f, 0x6e, 0x21, 0x03, 0x7d, 0x87, 0xde, 0x8a, 0xfd, + 0x21, 0x45, 0x11, 0x42, 0xe0, 0x02, 0xb9, 0x71, 0x67, 0xbe, 0xf9, 0xe6, 0x9b, 0xd9, 0x99, 0x25, + 0x0c, 0x66, 0xe9, 0x82, 0x30, 0x6f, 0xce, 0xac, 0xd5, 0xb7, 0xcf, 0xbe, 0x5b, 0x5b, 0x94, 0x61, + 0x46, 0x2c, 0xf6, 0x5b, 0x46, 0xa8, 0x99, 0xe5, 0x29, 0x4b, 0xd1, 0xc3, 0x02, 0x61, 0x0a, 0x84, + 0x29, 0x10, 0xdd, 0x87, 0x41, 0x1a, 0xa4, 0x02, 0x60, 0xf1, 0x2f, 0x89, 0xed, 0xf6, 0x6b, 0x6c, + 0xd8, 0x9b, 0x45, 0x55, 0xb2, 0x6e, 0x3d, 0x9d, 0xf0, 0xed, 0x20, 0x1e, 0xef, 0x45, 0xac, 0x70, + 0x1c, 0xf9, 0x98, 0xa5, 0xb9, 0x42, 0x3d, 0xda, 0x8b, 0xca, 0x70, 0x8e, 0x17, 0x05, 0xd1, 0xb0, + 0x06, 0x59, 0x91, 0x9c, 0x46, 0x69, 0xb2, 0x93, 0xac, 0x1f, 0xa4, 0x69, 0x10, 0x13, 0x4b, 0x9c, + 0xbc, 0xe5, 0xdc, 0x62, 0xd1, 0x82, 0x50, 0x86, 0x17, 0x99, 0x04, 0x0c, 0xff, 0xd1, 0xa0, 0xfd, + 0xa3, 0x3d, 0x9a, 0x38, 0x84, 0x66, 0x69, 0x42, 0x09, 0x45, 0xcf, 0x41, 0xf7, 0x49, 0x1c, 0xad, + 0x48, 0xee, 0xb2, 0x35, 0x35, 0xb4, 0xc1, 0xe1, 0xb9, 0xfe, 0xf4, 0x89, 0x59, 0x6b, 0x12, 0x2f, + 0xdc, 0x2c, 0x82, 0xc6, 0x12, 0x7f, 0xb5, 0x76, 0xc0, 0x2f, 0x3e, 0x29, 0xb2, 0xa1, 0x45, 0x12, + 0xdf, 0xf5, 0xe2, 0x74, 0xf6, 0xc6, 0xf8, 0x64, 0xa0, 0x9d, 0xeb, 0x4f, 0xcf, 0x3e, 0x48, 0x73, + 0x91, 0xf8, 0x36, 0x07, 0x3b, 0x4d, 0xa2, 0xbe, 0xd0, 0x25, 0xe8, 0x1e, 0x09, 0xa2, 0x44, 0xb1, + 0x1c, 0x0a, 0x96, 0xaf, 0x3f, 0xc8, 0x62, 0x73, 0xbc, 0xe4, 0x01, 0xaf, 0xfc, 0x1e, 0xfe, 0xae, + 0x41, 0x67, 0x5a, 0x34, 0x99, 0x4e, 0x92, 0x79, 0x8a, 0x9e, 0x43, 0xbb, 0x6c, 0xbb, 0x4b, 0x09, + 0x33, 0x34, 0x41, 0x3f, 0xac, 0xd3, 0xcb, 0x86, 0x96, 0xc1, 0xaf, 0x09, 0x73, 0x8e, 0x57, 0x95, + 0x13, 0x32, 0xe1, 0x34, 0xc6, 0x94, 0xb9, 0x21, 0x89, 0x82, 0x90, 0xb9, 0xb3, 0x10, 0x27, 0x01, + 0xf1, 0x45, 0xcd, 0x87, 0xce, 0x03, 0xee, 0xba, 0x14, 0x9e, 0x91, 0x74, 0x0c, 0xff, 0xd0, 0xe0, + 0x74, 0xc4, 0xb5, 0x26, 0x74, 0x49, 0x7f, 0x16, 0x77, 0x2a, 0x04, 0x4d, 0xe1, 0xd3, 0x59, 0x61, + 0x76, 0xe5, 0x5d, 0x2b, 0x4d, 0x67, 0xfb, 0x35, 0xd5, 0x48, 0xec, 0x7b, 0xef, 0x6e, 0xfa, 0x07, + 0xce, 0xc9, 0x6c, 0xd7, 0xfc, 0xbf, 0xf5, 0x5d, 0xc3, 0x83, 0x9d, 0x99, 0x10, 0xe2, 0x7e, 0x82, + 0x0e, 0xef, 0xb3, 0x9b, 0x17, 0x56, 0x25, 0xed, 0x2b, 0x73, 0xdf, 0xfe, 0x98, 0x3b, 0x04, 0x4e, + 0x9b, 0x87, 0x6e, 0x67, 0xec, 0x33, 0x38, 0x92, 0x5a, 0x94, 0x06, 0x75, 0x1a, 0xc6, 0xd0, 0x98, + 0xca, 0x29, 0x46, 0x17, 0xd0, 0x2a, 0xcb, 0x50, 0x99, 0x1e, 0xd5, 0x33, 0xa9, 0x89, 0xdf, 0xb6, + 0x41, 0x35, 0x60, 0x1b, 0x89, 0xba, 0xd0, 0xa4, 0xe9, 0x9c, 0x5d, 0xe3, 0x9c, 0x88, 0x5c, 0x2d, + 0xa7, 0x3c, 0x0f, 0xff, 0x3d, 0x82, 0xfb, 0xaf, 0xb9, 0x58, 0xf4, 0x03, 0x34, 0x14, 0x97, 0x4a, + 0xf5, 0xe5, 0xfe, 0xa2, 0x94, 0x38, 0x95, 0xa6, 0x88, 0x41, 0x4f, 0xa0, 0x39, 0x0b, 0x71, 0x94, + 0xb8, 0x91, 0x6c, 0x6a, 0xcb, 0xd6, 0x37, 0x37, 0xfd, 0xc6, 0x88, 0xdb, 0x26, 0x63, 0xa7, 0x21, + 0x9c, 0x13, 0x1f, 0x9d, 0x41, 0x27, 0x4a, 0x22, 0x16, 0xe1, 0x58, 0x5d, 0x85, 0xd1, 0x11, 0xe5, + 0xb7, 0x95, 0x55, 0xde, 0x02, 0xfa, 0x06, 0xc4, 0x9d, 0xc8, 0x99, 0x2f, 0x90, 0x87, 0x02, 0x79, + 0xc2, 0x1d, 0x62, 0xa0, 0x15, 0x76, 0x0a, 0xed, 0x0a, 0x36, 0xf2, 0x8d, 0x7b, 0xfb, 0xf5, 0xcb, + 0x79, 0x11, 0x91, 0x93, 0xb1, 0x7d, 0xca, 0xf5, 0x6f, 0x6e, 0xfa, 0xfa, 0xcb, 0x82, 0x6e, 0x32, + 0x76, 0xf4, 0x92, 0x7b, 0xe2, 0xa3, 0x97, 0x70, 0x52, 0xe1, 0xe5, 0xaf, 0x86, 0x71, 0x5f, 0x30, + 0x77, 0x4d, 0xf9, 0xa4, 0x98, 0xc5, 0x93, 0x62, 0x5e, 0x15, 0x4f, 0x8a, 0xdd, 0xe4, 0xb4, 0x6f, + 0xff, 0xea, 0x6b, 0x4e, 0xbb, 0xe4, 0xe2, 0x5e, 0xf4, 0x02, 0x4e, 0x12, 0xb2, 0x66, 0x6e, 0xb9, + 0x35, 0xd4, 0x38, 0xba, 0xf3, 0xae, 0x75, 0x78, 0xe8, 0x76, 0x75, 0x91, 0x0d, 0x50, 0xe1, 0x69, + 0xdc, 0x99, 0xa7, 0x12, 0xc5, 0x05, 0x89, 0xf2, 0x2a, 0x44, 0xcd, 0xbb, 0x0b, 0xe2, 0xa1, 0x15, + 0x41, 0x23, 0xe8, 0x55, 0xd7, 0x6b, 0xcb, 0x59, 0x6e, 0x5a, 0x4b, 0x5c, 0xde, 0x17, 0xdb, 0x4d, + 0xdb, 0x46, 0xab, 0x9d, 0xdb, 0xbb, 0xfb, 0xf0, 0x11, 0x76, 0xff, 0x15, 0x3c, 0xde, 0xd9, 0xfd, + 0x5a, 0x8e, 0x52, 0xa2, 0x2e, 0x24, 0x0e, 0x2a, 0x8f, 0xc1, 0x2e, 0x51, 0xa1, 0xb3, 0x18, 0xce, + 0x9c, 0xd0, 0x65, 0xcc, 0xa8, 0x1b, 0x62, 0x1a, 0x1a, 0xc7, 0x03, 0xed, 0xfc, 0x58, 0x0e, 0xa7, + 0x23, 0xed, 0x97, 0x98, 0x86, 0xe8, 0x73, 0x68, 0xe2, 0x2c, 0x93, 0x90, 0xb6, 0x80, 0x34, 0x70, + 0x96, 0x71, 0x97, 0x7d, 0xf5, 0x6e, 0xd3, 0xd3, 0xde, 0x6f, 0x7a, 0xda, 0xdf, 0x9b, 0x9e, 0xf6, + 0xf6, 0xb6, 0x77, 0xf0, 0xfe, 0xb6, 0x77, 0xf0, 0xe7, 0x6d, 0xef, 0xe0, 0xd7, 0xef, 0x83, 0x88, + 0x85, 0x4b, 0x8f, 0x17, 0x6d, 0xbd, 0xf8, 0x65, 0x7a, 0xf1, 0x8a, 0xb0, 0xeb, 0x34, 0x7f, 0x63, + 0xd5, 0xfe, 0x76, 0xf2, 0xd7, 0x5c, 0x1a, 0xc5, 0x7e, 0x7a, 0x47, 0xc2, 0xfa, 0xec, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xf1, 0xdc, 0x58, 0xe1, 0xf5, 0x07, 0x00, 0x00, } func (m *ABCIResponses) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/state/types.proto b/proto/cometbft/v034x/state/types.proto similarity index 64% rename from proto/tendermint/state/types.proto rename to proto/cometbft/v034x/state/types.proto index f3fdc0ef39e..bcebeefdec6 100644 --- a/proto/tendermint/state/types.proto +++ b/proto/cometbft/v034x/state/types.proto @@ -1,34 +1,34 @@ syntax = "proto3"; -package tendermint.state; +package cometbft.v034x.state; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/state"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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/v034x/abci/types.proto"; +import "cometbft/v034x/types/types.proto"; +import "cometbft/v034x/types/validator.proto"; +import "cometbft/v034x/types/params.proto"; +import "cometbft/v034x/version/types.proto"; import "google/protobuf/timestamp.proto"; // ABCIResponses retains the responses // of the various ABCI calls during block processing. // It is persisted to disk for each height before calling Commit. message ABCIResponses { - repeated tendermint.abci.ResponseDeliverTx deliver_txs = 1; - tendermint.abci.ResponseEndBlock end_block = 2; - tendermint.abci.ResponseBeginBlock begin_block = 3; + repeated cometbft.v034x.abci.ResponseDeliverTx deliver_txs = 1; + cometbft.v034x.abci.ResponseEndBlock end_block = 2; + cometbft.v034x.abci.ResponseBeginBlock begin_block = 3; } // ValidatorsInfo represents the latest validator set, or the last height it changed message ValidatorsInfo { - tendermint.types.ValidatorSet validator_set = 1; + cometbft.v034x.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.v034x.types.ConsensusParams consensus_params = 1 [(gogoproto.nullable) = false]; int64 last_height_changed = 2; } @@ -38,7 +38,7 @@ message ABCIResponsesInfo { } message Version { - tendermint.version.Consensus consensus = 1 [(gogoproto.nullable) = false]; + cometbft.v034x.version.Consensus consensus = 1 [(gogoproto.nullable) = false]; string software = 2; } @@ -51,7 +51,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.v034x.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]; @@ -62,14 +62,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.v034x.types.ValidatorSet next_validators = 6; + cometbft.v034x.types.ValidatorSet validators = 7; + cometbft.v034x.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.v034x.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/v034x/statesync/message.go similarity index 96% rename from proto/tendermint/statesync/message.go rename to proto/cometbft/v034x/statesync/message.go index 66f583674fc..5e2b9085a5c 100644 --- a/proto/tendermint/statesync/message.go +++ b/proto/cometbft/v034x/statesync/message.go @@ -3,8 +3,8 @@ package statesync import ( "fmt" + "github.com/KYVENetwork/cometbft/v034x/p2p" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/p2p" ) var _ p2p.Wrapper = &ChunkRequest{} diff --git a/proto/tendermint/statesync/types.pb.go b/proto/cometbft/v034x/statesync/types.pb.go similarity index 91% rename from proto/tendermint/statesync/types.pb.go rename to proto/cometbft/v034x/statesync/types.pb.go index c54d57798ab..9c166f40c38 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/cometbft/v034x/statesync/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/statesync/types.proto +// source: cometbft/v034x/statesync/types.proto package statesync @@ -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_904a76bd050c9d0d, []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_904a76bd050c9d0d, []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_904a76bd050c9d0d, []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_904a76bd050c9d0d, []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_904a76bd050c9d0d, []int{4} } func (m *ChunkResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,42 +383,45 @@ 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{ - // 393 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6a, 0xdb, 0x40, - 0x18, 0x94, 0xfc, 0xcf, 0x57, 0xab, 0xd8, 0x8b, 0x29, 0xa2, 0x07, 0x61, 0x54, 0x68, 0x7b, 0x92, - 0xa0, 0x3d, 0xf6, 0xe6, 0x5e, 0x5c, 0x68, 0x2f, 0xdb, 0x18, 0x42, 0x2e, 0x61, 0x2d, 0x6f, 0x24, - 0x11, 0xb4, 0x52, 0xf4, 0xad, 0x20, 0x7e, 0x80, 0x9c, 0x72, 0xc9, 0x63, 0xe5, 0xe8, 0x63, 0xc8, - 0x29, 0xd8, 0x2f, 0x12, 0xb4, 0x92, 0x65, 0xc5, 0x31, 0x09, 0x81, 0xdc, 0x76, 0xc6, 0xe3, 0xd1, - 0xcc, 0xc0, 0x07, 0x63, 0xc9, 0xc5, 0x82, 0xa7, 0x51, 0x28, 0xa4, 0x8b, 0x92, 0x49, 0x8e, 0x4b, - 0xe1, 0xb9, 0x72, 0x99, 0x70, 0x74, 0x92, 0x34, 0x96, 0x31, 0x19, 0xed, 0x14, 0x4e, 0xa5, 0xb0, - 0xef, 0x1b, 0xd0, 0xfd, 0xc7, 0x11, 0x99, 0xcf, 0xc9, 0x0c, 0x86, 0x28, 0x58, 0x82, 0x41, 0x2c, - 0xf1, 0x34, 0xe5, 0x17, 0x19, 0x47, 0x69, 0xea, 0x63, 0xfd, 0xfb, 0x87, 0x1f, 0x5f, 0x9d, 0x43, - 0xff, 0x76, 0xfe, 0x6f, 0xe5, 0xb4, 0x50, 0x4f, 0x35, 0x3a, 0xc0, 0x3d, 0x8e, 0x1c, 0x03, 0xa9, - 0xdb, 0x62, 0x12, 0x0b, 0xe4, 0x66, 0x43, 0xf9, 0x7e, 0x7b, 0xd5, 0xb7, 0x90, 0x4f, 0x35, 0x3a, - 0xc4, 0x7d, 0x92, 0xfc, 0x01, 0xc3, 0x0b, 0x32, 0x71, 0x5e, 0x85, 0x6d, 0x2a, 0x53, 0xfb, 0xb0, - 0xe9, 0xef, 0x5c, 0xba, 0x0b, 0xda, 0xf7, 0x6a, 0x98, 0xfc, 0x85, 0x8f, 0x5b, 0xab, 0x32, 0x60, - 0x4b, 0x79, 0x7d, 0x79, 0xd1, 0xab, 0x0a, 0x67, 0x78, 0x75, 0x62, 0xd2, 0x86, 0x26, 0x66, 0x91, - 0x4d, 0x60, 0xb0, 0xbf, 0x90, 0x7d, 0xad, 0xc3, 0xf0, 0x59, 0x3d, 0xf2, 0x09, 0x3a, 0x01, 0x0f, - 0xfd, 0xa0, 0xd8, 0xbb, 0x45, 0x4b, 0x94, 0xf3, 0x67, 0x71, 0x1a, 0x31, 0xa9, 0xf6, 0x32, 0x68, - 0x89, 0x72, 0x5e, 0x7d, 0x11, 0x55, 0x65, 0x83, 0x96, 0x88, 0x10, 0x68, 0x05, 0x0c, 0x03, 0x15, - 0xbe, 0x4f, 0xd5, 0x9b, 0x7c, 0x86, 0x5e, 0xc4, 0x25, 0x5b, 0x30, 0xc9, 0xcc, 0xb6, 0xe2, 0x2b, - 0x6c, 0x1f, 0x41, 0xbf, 0x3e, 0xcb, 0x9b, 0x73, 0x8c, 0xa0, 0x1d, 0x8a, 0x05, 0xbf, 0x2c, 0x63, - 0x14, 0xc0, 0xbe, 0xd2, 0xc1, 0x78, 0xb2, 0xd0, 0xfb, 0xf8, 0xe6, 0xac, 0xea, 0x59, 0xd6, 0x2b, - 0x00, 0x31, 0xa1, 0x1b, 0x85, 0x88, 0xa1, 0xf0, 0x55, 0xbd, 0x1e, 0xdd, 0xc2, 0xc9, 0xec, 0x76, - 0x6d, 0xe9, 0xab, 0xb5, 0xa5, 0x3f, 0xac, 0x2d, 0xfd, 0x66, 0x63, 0x69, 0xab, 0x8d, 0xa5, 0xdd, - 0x6d, 0x2c, 0xed, 0xe4, 0x97, 0x1f, 0xca, 0x20, 0x9b, 0x3b, 0x5e, 0x1c, 0xb9, 0xb5, 0xcb, 0xa9, - 0x3d, 0xd5, 0xd1, 0xb8, 0x87, 0xae, 0x6a, 0xde, 0x51, 0xbf, 0xfd, 0x7c, 0x0c, 0x00, 0x00, 0xff, - 0xff, 0xcc, 0x16, 0xc2, 0x8b, 0x74, 0x03, 0x00, 0x00, + proto.RegisterType((*Message)(nil), "cometbft.v034x.statesync.Message") + proto.RegisterType((*SnapshotsRequest)(nil), "cometbft.v034x.statesync.SnapshotsRequest") + proto.RegisterType((*SnapshotsResponse)(nil), "cometbft.v034x.statesync.SnapshotsResponse") + proto.RegisterType((*ChunkRequest)(nil), "cometbft.v034x.statesync.ChunkRequest") + proto.RegisterType((*ChunkResponse)(nil), "cometbft.v034x.statesync.ChunkResponse") +} + +func init() { + proto.RegisterFile("cometbft/v034x/statesync/types.proto", fileDescriptor_904a76bd050c9d0d) +} + +var fileDescriptor_904a76bd050c9d0d = []byte{ + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0xca, 0xd3, 0x40, + 0x14, 0x4d, 0xfa, 0xcf, 0xb5, 0x91, 0x76, 0x10, 0x09, 0x2e, 0x82, 0x04, 0x51, 0x51, 0x48, 0xc4, + 0xba, 0x76, 0x51, 0x11, 0x0a, 0x52, 0x91, 0x51, 0xc4, 0x8a, 0x20, 0xd3, 0x74, 0x9a, 0x84, 0x92, + 0x1f, 0x73, 0x27, 0xda, 0x3e, 0x80, 0x2b, 0x37, 0x3e, 0x96, 0xcb, 0x2e, 0x5d, 0x4a, 0xbb, 0xf3, + 0x29, 0x24, 0x93, 0x9f, 0xc6, 0x48, 0xf1, 0xfb, 0xe0, 0xdb, 0xe5, 0x9c, 0xdc, 0x7b, 0xe6, 0x9c, + 0x33, 0x0c, 0xdc, 0x71, 0xa2, 0x80, 0x8b, 0xe5, 0x5a, 0xd8, 0x9f, 0x1f, 0x4d, 0x9e, 0x6c, 0x6d, + 0x14, 0x4c, 0x70, 0xdc, 0x85, 0x8e, 0x2d, 0x76, 0x31, 0x47, 0x2b, 0x4e, 0x22, 0x11, 0x11, 0xbd, + 0x9c, 0xb2, 0xe4, 0x94, 0x55, 0x4d, 0x99, 0xbf, 0x5b, 0xd0, 0x9f, 0x73, 0x44, 0xe6, 0x72, 0xb2, + 0x80, 0x31, 0x86, 0x2c, 0x46, 0x2f, 0x12, 0xf8, 0x31, 0xe1, 0x9f, 0x52, 0x8e, 0x42, 0x57, 0x6f, + 0xab, 0xf7, 0xaf, 0x3d, 0x7e, 0x60, 0x9d, 0x53, 0xb0, 0x5e, 0x97, 0x2b, 0x34, 0xdf, 0x98, 0x29, + 0x74, 0x84, 0x0d, 0x8e, 0x7c, 0x00, 0x52, 0x97, 0xc6, 0x38, 0x0a, 0x91, 0xeb, 0x2d, 0xa9, 0xfd, + 0xf0, 0x42, 0xda, 0xf9, 0xca, 0x4c, 0xa1, 0x63, 0x6c, 0x92, 0x64, 0x0e, 0x9a, 0xe3, 0xa5, 0xe1, + 0xa6, 0x32, 0xdd, 0x96, 0xc2, 0x77, 0xcf, 0x0b, 0x3f, 0xcb, 0xc6, 0x4f, 0x86, 0x87, 0x4e, 0x0d, + 0x93, 0x57, 0x70, 0xbd, 0x94, 0x2b, 0x8c, 0x76, 0xa4, 0xde, 0xbd, 0xff, 0xea, 0x55, 0x26, 0x35, + 0xa7, 0x4e, 0x4c, 0xbb, 0xd0, 0xc6, 0x34, 0x30, 0x09, 0x8c, 0x9a, 0x6d, 0x99, 0xdf, 0x54, 0x18, + 0xff, 0x13, 0x93, 0xdc, 0x84, 0x9e, 0xc7, 0x7d, 0xd7, 0xcb, 0xfb, 0xef, 0xd0, 0x02, 0x65, 0xfc, + 0x3a, 0x4a, 0x02, 0x26, 0x64, 0x77, 0x1a, 0x2d, 0x50, 0xc6, 0xcb, 0x13, 0x51, 0x46, 0xd7, 0x68, + 0x81, 0x08, 0x81, 0x8e, 0xc7, 0xd0, 0x93, 0x01, 0x86, 0x54, 0x7e, 0x93, 0x5b, 0x30, 0x08, 0xb8, + 0x60, 0x2b, 0x26, 0x98, 0xde, 0x95, 0x7c, 0x85, 0xcd, 0x37, 0x30, 0xac, 0x57, 0x73, 0x69, 0x1f, + 0x37, 0xa0, 0xeb, 0x87, 0x2b, 0xbe, 0x2d, 0x6c, 0xe4, 0xc0, 0xfc, 0xaa, 0x82, 0xf6, 0x57, 0x43, + 0x57, 0xa3, 0x9b, 0xb1, 0x32, 0x67, 0x11, 0x2f, 0x07, 0x44, 0x87, 0x7e, 0xe0, 0x23, 0xfa, 0xa1, + 0x2b, 0xe3, 0x0d, 0x68, 0x09, 0xa7, 0xef, 0x7e, 0x1c, 0x0c, 0x75, 0x7f, 0x30, 0xd4, 0x5f, 0x07, + 0x43, 0xfd, 0x7e, 0x34, 0x94, 0xfd, 0xd1, 0x50, 0x7e, 0x1e, 0x0d, 0xe5, 0xfd, 0x53, 0xd7, 0x17, + 0x5e, 0xba, 0xcc, 0x2e, 0xd8, 0x7e, 0xb1, 0x78, 0xfb, 0xfc, 0x25, 0x17, 0x5f, 0xa2, 0x64, 0x63, + 0x37, 0x5e, 0x97, 0x7c, 0x4d, 0x27, 0xb2, 0xba, 0xff, 0x65, 0x4f, 0xfe, 0x99, 0xfc, 0x09, 0x00, + 0x00, 0xff, 0xff, 0x71, 0xc0, 0xcd, 0x42, 0x8f, 0x03, 0x00, 0x00, } func (m *Message) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/statesync/types.proto b/proto/cometbft/v034x/statesync/types.proto similarity index 83% rename from proto/tendermint/statesync/types.proto rename to proto/cometbft/v034x/statesync/types.proto index 8d4a714c1db..f5bb2597f55 100644 --- a/proto/tendermint/statesync/types.proto +++ b/proto/cometbft/v034x/statesync/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.statesync; +package cometbft.v034x.statesync; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/statesync"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync"; message Message { oneof sum { diff --git a/proto/tendermint/store/types.pb.go b/proto/cometbft/v034x/store/types.pb.go similarity index 82% rename from proto/tendermint/store/types.pb.go rename to proto/cometbft/v034x/store/types.pb.go index 384fbe52aed..f32bf58dde3 100644 --- a/proto/tendermint/store/types.pb.go +++ b/proto/cometbft/v034x/store/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/store/types.proto +// source: cometbft/v034x/store/types.proto package store @@ -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_2ac11c66afee455f, []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.v034x.store.BlockStoreState") } -func init() { proto.RegisterFile("tendermint/store/types.proto", fileDescriptor_ff9e53a0a74267f7) } +func init() { proto.RegisterFile("cometbft/v034x/store/types.proto", fileDescriptor_2ac11c66afee455f) } -var fileDescriptor_ff9e53a0a74267f7 = []byte{ - // 165 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, 0x05, 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, 0x79, 0x7a, 0x66, - 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x92, 0x9b, 0x90, 0x98, 0x60, 0x27, 0xe9, - 0xa3, 0xbb, 0x37, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xef, 0xa6, 0x30, - 0x63, 0xca, 0x00, 0x00, 0x00, +var fileDescriptor_2ac11c66afee455f = []byte{ + // 183 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, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, + 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xa9, + 0xd0, 0x03, 0xab, 0xd0, 0x03, 0xab, 0x50, 0xb2, 0xe5, 0xe2, 0x77, 0xca, 0xc9, 0x4f, 0xce, 0x0e, + 0x06, 0xf1, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0x84, 0xb8, 0x58, 0x92, 0x12, 0x8b, 0x53, 0x25, + 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xc0, 0x6c, 0x21, 0x31, 0x2e, 0xb6, 0x8c, 0xd4, 0xcc, 0xf4, + 0x8c, 0x12, 0x09, 0x26, 0xb0, 0x28, 0x94, 0xe7, 0x14, 0x72, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, + 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, + 0xc7, 0x72, 0x0c, 0x51, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, + 0xde, 0x91, 0x61, 0xae, 0x7e, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0xfa, 0x68, 0xee, 0x04, 0xbb, + 0x0d, 0x21, 0x08, 0x76, 0x54, 0x12, 0x1b, 0x58, 0xd4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xab, + 0xc7, 0x76, 0x74, 0xd5, 0x00, 0x00, 0x00, } func (m *BlockStoreState) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v034x/store/types.proto b/proto/cometbft/v034x/store/types.proto new file mode 100644 index 00000000000..d3f9dfe721f --- /dev/null +++ b/proto/cometbft/v034x/store/types.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package cometbft.v034x.store; + +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/store"; + +message BlockStoreState { + int64 base = 1; + int64 height = 2; +} diff --git a/proto/tendermint/types/block.pb.go b/proto/cometbft/v034x/types/block.pb.go similarity index 83% rename from proto/tendermint/types/block.pb.go rename to proto/cometbft/v034x/types/block.pb.go index f2077aad8bf..ce191e2422c 100644 --- a/proto/tendermint/types/block.pb.go +++ b/proto/cometbft/v034x/types/block.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/block.proto +// source: cometbft/v034x/types/block.proto package types @@ -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_564a5f8bf415a1bb, []int{0} } func (m *Block) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,30 +92,31 @@ func (m *Block) GetLastCommit() *Commit { } func init() { - proto.RegisterType((*Block)(nil), "tendermint.types.Block") + proto.RegisterType((*Block)(nil), "cometbft.v034x.types.Block") } -func init() { proto.RegisterFile("tendermint/types/block.proto", fileDescriptor_70840e82f4357ab1) } +func init() { proto.RegisterFile("cometbft/v034x/types/block.proto", fileDescriptor_564a5f8bf415a1bb) } -var fileDescriptor_70840e82f4357ab1 = []byte{ - // 266 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, 0xa7, 0xc0, 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, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x47, 0x0e, - 0x36, 0x04, 0x13, 0x12, 0xf8, 0xe8, 0x41, 0x9a, 0xc4, 0x06, 0x16, 0x37, 0x06, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x79, 0x8c, 0xb5, 0x43, 0xd1, 0x01, 0x00, 0x00, +var fileDescriptor_564a5f8bf415a1bb = []byte{ + // 285 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, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, + 0xd6, 0x4f, 0xca, 0xc9, 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xa9, + 0xd0, 0x03, 0xab, 0xd0, 0x03, 0xab, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, + 0xb1, 0x20, 0x6a, 0xa5, 0xb0, 0x9b, 0x06, 0x26, 0xa1, 0x2a, 0x94, 0xb1, 0xaa, 0x48, 0x2d, 0xcb, + 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0x85, 0x28, 0x52, 0xfa, 0xc7, 0xc8, 0xc5, 0xea, 0x04, 0x72, 0x82, + 0x90, 0x15, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, 0x6a, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, + 0x91, 0x8c, 0x1e, 0x36, 0xd7, 0xe8, 0x79, 0x80, 0xd5, 0x38, 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x10, + 0x04, 0xd5, 0x21, 0x64, 0xc2, 0xc5, 0x92, 0x92, 0x58, 0x92, 0x28, 0xc1, 0x04, 0xd6, 0x29, 0x85, + 0x5d, 0xa7, 0x4b, 0x62, 0x49, 0x22, 0x54, 0x1f, 0x58, 0xb5, 0x90, 0x0b, 0x17, 0x07, 0xcc, 0x35, + 0x12, 0xcc, 0x60, 0x9d, 0x4a, 0xd8, 0x75, 0xba, 0x42, 0x55, 0xf9, 0x64, 0x16, 0x97, 0x40, 0x4d, + 0x80, 0xeb, 0x14, 0xb2, 0xe5, 0xe2, 0xce, 0x49, 0x2c, 0x2e, 0x89, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, + 0x2c, 0x91, 0x60, 0xc1, 0xe7, 0x78, 0x67, 0xb0, 0x9a, 0x20, 0x2e, 0x90, 0x06, 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, 0x26, 0xe9, 0x7b, 0x47, 0x86, 0xb9, 0xfa, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, + 0xeb, 0xa3, 0x05, 0x2b, 0x24, 0x66, 0xe0, 0x82, 0x60, 0x8b, 0x92, 0xd8, 0xc0, 0xa2, 0xc6, 0x80, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xad, 0xa4, 0xf1, 0xf4, 0x01, 0x00, 0x00, } func (m *Block) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v034x/types/block.proto b/proto/cometbft/v034x/types/block.proto new file mode 100644 index 00000000000..30bf0e98689 --- /dev/null +++ b/proto/cometbft/v034x/types/block.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package cometbft.v034x.types; + +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; + +import "gogoproto/gogo.proto"; +import "cometbft/v034x/types/types.proto"; +import "cometbft/v034x/types/evidence.proto"; + +message Block { + Header header = 1 [(gogoproto.nullable) = false]; + Data data = 2 [(gogoproto.nullable) = false]; + cometbft.v034x.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; + Commit last_commit = 4; +} diff --git a/proto/tendermint/types/canonical.pb.go b/proto/cometbft/v034x/types/canonical.pb.go similarity index 88% rename from proto/tendermint/types/canonical.pb.go rename to proto/cometbft/v034x/types/canonical.pb.go index 7098310430d..094cdd5c8ff 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/cometbft/v034x/types/canonical.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/canonical.proto +// source: cometbft/v034x/types/canonical.proto package types @@ -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_315404733d7f05c5, []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_315404733d7f05c5, []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.v034x.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_315404733d7f05c5, []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.v034x.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_315404733d7f05c5, []int{3} } func (m *CanonicalVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -309,47 +309,50 @@ func (m *CanonicalVote) 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((*CanonicalBlockID)(nil), "cometbft.v034x.types.CanonicalBlockID") + proto.RegisterType((*CanonicalPartSetHeader)(nil), "cometbft.v034x.types.CanonicalPartSetHeader") + proto.RegisterType((*CanonicalProposal)(nil), "cometbft.v034x.types.CanonicalProposal") + proto.RegisterType((*CanonicalVote)(nil), "cometbft.v034x.types.CanonicalVote") } -func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } +func init() { + proto.RegisterFile("cometbft/v034x/types/canonical.proto", fileDescriptor_315404733d7f05c5) +} -var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xce, 0xa5, 0x4e, 0xe2, 0x5c, 0x1b, 0x08, 0xa7, 0xaa, 0xb2, 0x22, 0x64, 0x5b, 0x1e, 0x90, - 0x59, 0x6c, 0xa9, 0x1d, 0xd8, 0x5d, 0x06, 0x82, 0x40, 0x94, 0x6b, 0xd5, 0x81, 0x25, 0xba, 0xd8, - 0x87, 0x6d, 0xe1, 0xf8, 0x4e, 0xf6, 0x65, 0xe8, 0xc2, 0x6f, 0xe8, 0xef, 0xe0, 0x97, 0x74, 0xec, - 0x08, 0x4b, 0x40, 0xce, 0x1f, 0x41, 0x77, 0x4e, 0xec, 0xa8, 0x01, 0x16, 0x10, 0xcb, 0xe9, 0xfd, - 0x78, 0xee, 0x79, 0x1f, 0x3d, 0xaf, 0x5e, 0x68, 0x0b, 0x9a, 0x47, 0xb4, 0x58, 0xa4, 0xb9, 0xf0, - 0xc5, 0x0d, 0xa7, 0xa5, 0x1f, 0x92, 0x9c, 0xe5, 0x69, 0x48, 0x32, 0x8f, 0x17, 0x4c, 0x30, 0x34, - 0x6e, 0x11, 0x9e, 0x42, 0x4c, 0x8e, 0x63, 0x16, 0x33, 0xd5, 0xf4, 0x65, 0x54, 0xe3, 0x26, 0x4f, - 0xf7, 0x98, 0xd4, 0xbb, 0xe9, 0x5a, 0x31, 0x63, 0x71, 0x46, 0x7d, 0x95, 0xcd, 0x97, 0x1f, 0x7d, - 0x91, 0x2e, 0x68, 0x29, 0xc8, 0x82, 0xd7, 0x00, 0xe7, 0x33, 0x1c, 0x9f, 0x6f, 0x27, 0x07, 0x19, - 0x0b, 0x3f, 0x4d, 0x5f, 0x22, 0x04, 0xb5, 0x84, 0x94, 0x89, 0x01, 0x6c, 0xe0, 0x1e, 0x61, 0x15, - 0xa3, 0x6b, 0xf8, 0x98, 0x93, 0x42, 0xcc, 0x4a, 0x2a, 0x66, 0x09, 0x25, 0x11, 0x2d, 0x8c, 0xae, - 0x0d, 0xdc, 0xc3, 0x53, 0xd7, 0x7b, 0x28, 0xd4, 0x6b, 0x08, 0x2f, 0x48, 0x21, 0x2e, 0xa9, 0x78, - 0xa5, 0xf0, 0x81, 0x76, 0xb7, 0xb2, 0x3a, 0x78, 0xc4, 0x77, 0x8b, 0x4e, 0x00, 0x4f, 0x7e, 0x0d, - 0x47, 0xc7, 0xb0, 0x27, 0x98, 0x20, 0x99, 0x92, 0x31, 0xc2, 0x75, 0xd2, 0x68, 0xeb, 0xb6, 0xda, - 0x9c, 0x6f, 0x5d, 0xf8, 0xa4, 0x25, 0x29, 0x18, 0x67, 0x25, 0xc9, 0xd0, 0x19, 0xd4, 0xa4, 0x1c, - 0xf5, 0xfd, 0xd1, 0xa9, 0xb5, 0x2f, 0xf3, 0x32, 0x8d, 0x73, 0x1a, 0xbd, 0x2d, 0xe3, 0xab, 0x1b, - 0x4e, 0xb1, 0x02, 0xa3, 0x13, 0xd8, 0x4f, 0x68, 0x1a, 0x27, 0x42, 0x0d, 0x18, 0xe3, 0x4d, 0x26, - 0xc5, 0x14, 0x6c, 0x99, 0x47, 0xc6, 0x81, 0x2a, 0xd7, 0x09, 0x7a, 0x0e, 0x87, 0x9c, 0x65, 0xb3, - 0xba, 0xa3, 0xd9, 0xc0, 0x3d, 0x08, 0x8e, 0xaa, 0x95, 0xa5, 0x5f, 0xbc, 0x7b, 0x83, 0x65, 0x0d, - 0xeb, 0x9c, 0x65, 0x2a, 0x42, 0xaf, 0xa1, 0x3e, 0x97, 0xf6, 0xce, 0xd2, 0xc8, 0xe8, 0x29, 0xe3, - 0x9c, 0x3f, 0x18, 0xb7, 0xd9, 0x44, 0x70, 0x58, 0xad, 0xac, 0xc1, 0x26, 0xc1, 0x03, 0x45, 0x30, - 0x8d, 0x50, 0x00, 0x87, 0xcd, 0x1a, 0x8d, 0xbe, 0x22, 0x9b, 0x78, 0xf5, 0xa2, 0xbd, 0xed, 0xa2, - 0xbd, 0xab, 0x2d, 0x22, 0xd0, 0xa5, 0xef, 0xb7, 0xdf, 0x2d, 0x80, 0xdb, 0x6f, 0xe8, 0x19, 0xd4, - 0xc3, 0x84, 0xa4, 0xb9, 0xd4, 0x33, 0xb0, 0x81, 0x3b, 0xac, 0x67, 0x9d, 0xcb, 0x9a, 0x9c, 0xa5, - 0x9a, 0xd3, 0xc8, 0xf9, 0xd2, 0x85, 0xa3, 0x46, 0xd6, 0x35, 0x13, 0xf4, 0x7f, 0xf8, 0xba, 0x6b, - 0x96, 0xf6, 0x2f, 0xcd, 0xea, 0xfd, 0xbd, 0x59, 0xfd, 0xdf, 0x9b, 0x15, 0xbc, 0xbf, 0xab, 0x4c, - 0x70, 0x5f, 0x99, 0xe0, 0x47, 0x65, 0x82, 0xdb, 0xb5, 0xd9, 0xb9, 0x5f, 0x9b, 0x9d, 0xaf, 0x6b, - 0xb3, 0xf3, 0xe1, 0x45, 0x9c, 0x8a, 0x64, 0x39, 0xf7, 0x42, 0xb6, 0xf0, 0x77, 0x0f, 0xb6, 0x0d, - 0xeb, 0xc3, 0x7e, 0x78, 0xcc, 0xf3, 0xbe, 0xaa, 0x9f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6d, - 0xdd, 0x12, 0x5d, 0x31, 0x04, 0x00, 0x00, +var fileDescriptor_315404733d7f05c5 = []byte{ + // 511 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x53, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xce, 0xa6, 0xf9, 0xe3, 0x6c, 0x9b, 0xdf, 0xaf, 0xac, 0xa2, 0xca, 0xca, 0xc1, 0xb6, 0x02, + 0xaa, 0x82, 0x84, 0x6c, 0xd4, 0x22, 0x21, 0x71, 0x74, 0x41, 0x22, 0x02, 0x4a, 0xe5, 0x46, 0x95, + 0xe8, 0x25, 0x5a, 0xdb, 0x5b, 0xdb, 0xaa, 0xe3, 0xb5, 0xec, 0x0d, 0xd0, 0x2b, 0x4f, 0xd0, 0x67, + 0xe1, 0x29, 0x7a, 0xec, 0x91, 0x53, 0x00, 0xe7, 0x45, 0xd0, 0x8e, 0x13, 0xa7, 0x42, 0x41, 0x1c, + 0x40, 0x5c, 0x56, 0x33, 0xdf, 0x7e, 0x33, 0xf3, 0xed, 0x37, 0x5a, 0xfc, 0xc0, 0xe3, 0x53, 0x26, + 0xdc, 0x0b, 0x61, 0xbd, 0x7f, 0x7c, 0xf8, 0xe4, 0xa3, 0x25, 0xae, 0x52, 0x96, 0x5b, 0x1e, 0x4d, + 0x78, 0x12, 0x79, 0x34, 0x36, 0xd3, 0x8c, 0x0b, 0x4e, 0x7a, 0x2b, 0x96, 0x09, 0x2c, 0x13, 0x58, + 0xfd, 0x5e, 0xc0, 0x03, 0x0e, 0x04, 0x4b, 0x46, 0x25, 0xb7, 0x6f, 0x6c, 0xec, 0x08, 0xe7, 0x92, + 0xa1, 0x07, 0x9c, 0x07, 0x31, 0xb3, 0x20, 0x73, 0x67, 0x17, 0x96, 0x88, 0xa6, 0x2c, 0x17, 0x74, + 0x9a, 0x96, 0x84, 0xc1, 0x27, 0x84, 0x77, 0x8f, 0x56, 0x12, 0xec, 0x98, 0x7b, 0x97, 0xa3, 0xe7, + 0x84, 0xe0, 0x46, 0x48, 0xf3, 0x50, 0x45, 0x06, 0x1a, 0xee, 0x38, 0x10, 0x93, 0x73, 0xfc, 0x7f, + 0x4a, 0x33, 0x31, 0xc9, 0x99, 0x98, 0x84, 0x8c, 0xfa, 0x2c, 0x53, 0xeb, 0x06, 0x1a, 0x6e, 0x1f, + 0x3c, 0x32, 0x37, 0x29, 0x36, 0xab, 0xa6, 0x27, 0x34, 0x13, 0xa7, 0x4c, 0xbc, 0x84, 0x1a, 0xbb, + 0x71, 0x33, 0xd7, 0x6b, 0x4e, 0x37, 0xbd, 0x0b, 0x0e, 0x6c, 0xbc, 0xb7, 0x99, 0x4e, 0x7a, 0xb8, + 0x29, 0xb8, 0xa0, 0x31, 0x48, 0xe9, 0x3a, 0x65, 0x52, 0xe9, 0xab, 0xaf, 0xf5, 0x0d, 0xbe, 0xd7, + 0xf1, 0xbd, 0x75, 0x93, 0x8c, 0xa7, 0x3c, 0xa7, 0x31, 0x79, 0x8a, 0x1b, 0x52, 0x0e, 0x94, 0xff, + 0x77, 0x70, 0x7f, 0xb3, 0xd4, 0xd3, 0x28, 0x48, 0x98, 0xff, 0x26, 0x0f, 0xc6, 0x57, 0x29, 0x73, + 0xa0, 0x80, 0xec, 0xe1, 0x56, 0xc8, 0xa2, 0x20, 0x14, 0x30, 0x64, 0xd7, 0x59, 0x66, 0x52, 0x50, + 0xc6, 0x67, 0x89, 0xaf, 0x6e, 0x01, 0x5c, 0x26, 0xe4, 0x21, 0xee, 0xa4, 0x3c, 0x9e, 0x94, 0x37, + 0x0d, 0x03, 0x0d, 0xb7, 0xec, 0x9d, 0x62, 0xae, 0x2b, 0x27, 0x6f, 0x5f, 0x3b, 0x12, 0x73, 0x94, + 0x94, 0xc7, 0x10, 0x91, 0x63, 0xac, 0xb8, 0xd2, 0xe6, 0x49, 0xe4, 0xab, 0x4d, 0x30, 0x70, 0xff, + 0x37, 0x06, 0x2e, 0xb7, 0x62, 0x6f, 0x17, 0x73, 0xbd, 0xbd, 0x4c, 0x9c, 0x36, 0x34, 0x19, 0xf9, + 0xc4, 0xc6, 0x9d, 0x6a, 0xa7, 0x6a, 0x0b, 0x1a, 0xf6, 0xcd, 0x72, 0xeb, 0xe6, 0x6a, 0xeb, 0xe6, + 0x78, 0xc5, 0xb0, 0x15, 0xe9, 0xff, 0xf5, 0x57, 0x1d, 0x39, 0xeb, 0x32, 0xb2, 0x8f, 0x15, 0x2f, + 0xa4, 0x51, 0x22, 0x35, 0xb5, 0x0d, 0x34, 0xec, 0x94, 0xb3, 0x8e, 0x24, 0x26, 0x67, 0xc1, 0xe5, + 0xc8, 0x1f, 0x7c, 0xae, 0xe3, 0x6e, 0x25, 0xeb, 0x8c, 0x0b, 0xf6, 0xaf, 0xfc, 0xbd, 0x6b, 0x5a, + 0xe3, 0x6f, 0x9b, 0xd6, 0xfc, 0x73, 0xd3, 0x5a, 0xbf, 0x36, 0xcd, 0x1e, 0xdf, 0x14, 0x1a, 0xba, + 0x2d, 0x34, 0xf4, 0xad, 0xd0, 0xd0, 0xf5, 0x42, 0xab, 0xdd, 0x2e, 0xb4, 0xda, 0x97, 0x85, 0x56, + 0x3b, 0x7f, 0x16, 0x44, 0x22, 0x9c, 0xb9, 0xf2, 0x25, 0xd6, 0xab, 0x77, 0x67, 0x2f, 0x8e, 0x99, + 0xf8, 0xc0, 0xb3, 0x4b, 0xeb, 0xa7, 0x5f, 0x5d, 0x7e, 0xfb, 0x0a, 0x84, 0x87, 0xba, 0x2d, 0x40, + 0x0f, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0x84, 0x78, 0xa9, 0x28, 0x55, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/canonical.proto b/proto/cometbft/v034x/types/canonical.proto similarity index 90% rename from proto/tendermint/types/canonical.proto rename to proto/cometbft/v034x/types/canonical.proto index e88fd6ffe31..d3c12e4f506 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/cometbft/v034x/types/canonical.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v034x.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; +import "cometbft/v034x/types/types.proto"; import "google/protobuf/timestamp.proto"; message CanonicalBlockID { diff --git a/proto/tendermint/types/events.pb.go b/proto/cometbft/v034x/types/events.pb.go similarity index 83% rename from proto/tendermint/types/events.pb.go rename to proto/cometbft/v034x/types/events.pb.go index a9aa26a799b..165cb2a42fa 100644 --- a/proto/tendermint/types/events.pb.go +++ b/proto/cometbft/v034x/types/events.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/events.proto +// source: cometbft/v034x/types/events.proto package types @@ -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_603ff99cf08bc900, []int{0} } func (m *EventDataRoundState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,25 +83,26 @@ func (m *EventDataRoundState) GetStep() string { } func init() { - proto.RegisterType((*EventDataRoundState)(nil), "tendermint.types.EventDataRoundState") + proto.RegisterType((*EventDataRoundState)(nil), "cometbft.v034x.types.EventDataRoundState") } -func init() { proto.RegisterFile("tendermint/types/events.proto", fileDescriptor_72cfafd446dedf7c) } +func init() { proto.RegisterFile("cometbft/v034x/types/events.proto", fileDescriptor_603ff99cf08bc900) } -var fileDescriptor_72cfafd446dedf7c = []byte{ - // 189 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, 0x0a, 0x3c, 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, 0xf3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0x7d, 0x64, 0xe7, 0x22, 0x98, 0x60, 0xc7, 0xea, 0xa3, 0x7b, 0x25, 0x89, 0x0d, 0x2c, 0x6e, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xe9, 0x14, 0x02, 0xe5, 0x00, 0x00, 0x00, +var fileDescriptor_603ff99cf08bc900 = []byte{ + // 207 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, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, + 0xd6, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, + 0x29, 0xd1, 0x03, 0x2b, 0xd1, 0x03, 0x2b, 0x51, 0x0a, 0xe7, 0x12, 0x76, 0x05, 0xa9, 0x72, 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, 0xd1, 0xbc, 0x00, 0x76, 0x35, 0x42, 0x10, 0xec, 0xdc, 0x24, 0x36, 0xb0, + 0xa8, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xcf, 0xad, 0x17, 0x3f, 0xf0, 0x00, 0x00, 0x00, } func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v034x/types/events.proto b/proto/cometbft/v034x/types/events.proto new file mode 100644 index 00000000000..2c179a60673 --- /dev/null +++ b/proto/cometbft/v034x/types/events.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package cometbft.v034x.types; + +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; + +message EventDataRoundState { + int64 height = 1; + int32 round = 2; + string step = 3; +} diff --git a/proto/tendermint/types/evidence.pb.go b/proto/cometbft/v034x/types/evidence.pb.go similarity index 88% rename from proto/tendermint/types/evidence.pb.go rename to proto/cometbft/v034x/types/evidence.pb.go index daab3dc34fd..478a02d5113 100644 --- a/proto/tendermint/types/evidence.pb.go +++ b/proto/cometbft/v034x/types/evidence.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/evidence.proto +// source: cometbft/v034x/types/evidence.proto package types @@ -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_3194c123acb0d54d, []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_3194c123acb0d54d, []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_3194c123acb0d54d, []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_3194c123acb0d54d, []int{3} } func (m *EvidenceList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -311,50 +311,53 @@ 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.v034x.types.Evidence") + proto.RegisterType((*DuplicateVoteEvidence)(nil), "cometbft.v034x.types.DuplicateVoteEvidence") + proto.RegisterType((*LightClientAttackEvidence)(nil), "cometbft.v034x.types.LightClientAttackEvidence") + proto.RegisterType((*EvidenceList)(nil), "cometbft.v034x.types.EvidenceList") } -func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) } +func init() { + proto.RegisterFile("cometbft/v034x/types/evidence.proto", fileDescriptor_3194c123acb0d54d) +} -var fileDescriptor_6825fabc78e0a168 = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xed, 0x3a, 0xa9, 0xc2, 0xb6, 0x40, 0x58, 0x5a, 0x48, 0x43, 0xe4, 0x44, 0xe1, 0xd0, - 0x48, 0x80, 0x2d, 0x95, 0x03, 0x17, 0x2e, 0x35, 0x20, 0x15, 0x29, 0x42, 0x60, 0xa1, 0x1e, 0xb8, - 0x58, 0x6b, 0x7b, 0xeb, 0xac, 0x6a, 0xef, 0x5a, 0xf1, 0x24, 0xa8, 0x3c, 0x45, 0x1e, 0xab, 0x17, - 0xa4, 0x1e, 0x39, 0x01, 0x4a, 0x78, 0x10, 0xe4, 0xf5, 0x9f, 0x44, 0x75, 0xcc, 0x89, 0x4b, 0xe4, - 0xcc, 0xfc, 0xbe, 0x9d, 0x99, 0xcf, 0xb3, 0x46, 0x7d, 0xa0, 0xdc, 0xa7, 0xd3, 0x88, 0x71, 0x30, - 0xe1, 0x2a, 0xa6, 0x89, 0x49, 0xe7, 0xcc, 0xa7, 0xdc, 0xa3, 0x46, 0x3c, 0x15, 0x20, 0x70, 0x7b, - 0x0d, 0x18, 0x12, 0xe8, 0x1e, 0x04, 0x22, 0x10, 0x32, 0x69, 0xa6, 0x4f, 0x19, 0xd7, 0xed, 0x07, - 0x42, 0x04, 0x21, 0x35, 0xe5, 0x3f, 0x77, 0x76, 0x61, 0x02, 0x8b, 0x68, 0x02, 0x24, 0x8a, 0x73, - 0xa0, 0x57, 0xa9, 0x24, 0x7f, 0xf3, 0xec, 0xa0, 0x92, 0x9d, 0x93, 0x90, 0xf9, 0x04, 0xc4, 0x34, - 0x23, 0x86, 0x7f, 0x54, 0xd4, 0x7a, 0x97, 0xf7, 0x86, 0x09, 0x7a, 0xec, 0xcf, 0xe2, 0x90, 0x79, - 0x04, 0xa8, 0x33, 0x17, 0x40, 0x9d, 0xa2, 0xed, 0x8e, 0x3a, 0x50, 0x47, 0x7b, 0x27, 0xc7, 0xc6, - 0xed, 0xbe, 0x8d, 0xb7, 0x85, 0xe0, 0x5c, 0x00, 0x2d, 0x4e, 0x3a, 0x53, 0xec, 0x43, 0x7f, 0x5b, - 0x02, 0x73, 0xd4, 0x0b, 0x59, 0x30, 0x01, 0xc7, 0x0b, 0x19, 0xe5, 0xe0, 0x10, 0x00, 0xe2, 0x5d, - 0xae, 0xeb, 0xec, 0xc8, 0x3a, 0xcf, 0xaa, 0x75, 0xc6, 0xa9, 0xea, 0x8d, 0x14, 0x9d, 0x4a, 0xcd, - 0x46, 0xad, 0xa3, 0xb0, 0x2e, 0x69, 0x35, 0x91, 0x96, 0xcc, 0xa2, 0xe1, 0x62, 0x07, 0x1d, 0x6e, - 0xed, 0x14, 0xbf, 0x40, 0xbb, 0x72, 0x52, 0x92, 0x8f, 0xf8, 0xa8, 0x5a, 0x3a, 0xe5, 0xed, 0x66, - 0x4a, 0x9d, 0x96, 0xb8, 0x9b, 0x77, 0xfa, 0x4f, 0xdc, 0xc2, 0xcf, 0x11, 0x06, 0x01, 0x24, 0x4c, - 0xdd, 0x64, 0x3c, 0x70, 0x62, 0xf1, 0x95, 0x4e, 0x3b, 0xda, 0x40, 0x1d, 0x69, 0x76, 0x5b, 0x66, - 0xce, 0x65, 0xe2, 0x63, 0x1a, 0xc7, 0xc7, 0xe8, 0x7e, 0xf9, 0x7e, 0x72, 0xb4, 0x21, 0xd1, 0x7b, - 0x65, 0x38, 0x03, 0x2d, 0x74, 0xa7, 0x5c, 0x84, 0x4e, 0x53, 0x36, 0xd2, 0x35, 0xb2, 0x55, 0x31, - 0x8a, 0x55, 0x31, 0x3e, 0x17, 0x84, 0xd5, 0xba, 0xfe, 0xd9, 0x57, 0x16, 0xbf, 0xfa, 0xaa, 0xbd, - 0x96, 0x0d, 0xbf, 0xef, 0xa0, 0xa3, 0x5a, 0x53, 0xf1, 0x7b, 0xf4, 0xc0, 0x13, 0xfc, 0x22, 0x64, - 0x9e, 0xec, 0xdb, 0x0d, 0x85, 0x77, 0x99, 0x3b, 0xd4, 0xab, 0x79, 0x39, 0x56, 0xca, 0xd8, 0xed, - 0x0d, 0x99, 0x8c, 0xe0, 0xa7, 0xe8, 0xae, 0x27, 0xa2, 0x48, 0x70, 0x67, 0x42, 0x53, 0x4e, 0x3a, - 0xa7, 0xd9, 0xfb, 0x59, 0xf0, 0x4c, 0xc6, 0xf0, 0x07, 0x74, 0xe0, 0x5e, 0x7d, 0x23, 0x1c, 0x18, - 0xa7, 0x4e, 0x39, 0x6d, 0xd2, 0xd1, 0x06, 0xda, 0x68, 0xef, 0xe4, 0xc9, 0x16, 0x97, 0x0b, 0xc6, - 0x7e, 0x58, 0x0a, 0xcb, 0x58, 0x52, 0x63, 0x7c, 0xa3, 0xc6, 0xf8, 0xff, 0xe1, 0xe7, 0x18, 0xed, - 0x17, 0xee, 0x8d, 0x59, 0x02, 0xf8, 0x35, 0x6a, 0x6d, 0xdc, 0x1e, 0x4d, 0x1e, 0x59, 0x99, 0xa2, - 0xdc, 0xd3, 0x46, 0x7a, 0xa4, 0x5d, 0x2a, 0xac, 0x4f, 0xd7, 0x4b, 0x5d, 0xbd, 0x59, 0xea, 0xea, - 0xef, 0xa5, 0xae, 0x2e, 0x56, 0xba, 0x72, 0xb3, 0xd2, 0x95, 0x1f, 0x2b, 0x5d, 0xf9, 0xf2, 0x2a, - 0x60, 0x30, 0x99, 0xb9, 0x86, 0x27, 0x22, 0x73, 0xf3, 0x7a, 0xaf, 0x1f, 0xb3, 0xaf, 0xc8, 0xed, - 0xab, 0xef, 0xee, 0xca, 0xf8, 0xcb, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x21, 0x16, 0x68, - 0x9d, 0x04, 0x00, 0x00, +var fileDescriptor_3194c123acb0d54d = []byte{ + // 546 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x9b, 0xa6, 0x9d, 0x8a, 0x37, 0x60, 0x98, 0x4e, 0x74, 0x15, 0x4a, 0xab, 0x0e, 0x89, + 0x4a, 0xa0, 0x04, 0x36, 0x4e, 0x9c, 0x58, 0x60, 0xd2, 0x24, 0x06, 0x9a, 0xa2, 0xa9, 0x12, 0x5c, + 0xa2, 0x24, 0x75, 0x53, 0xab, 0x49, 0x1c, 0x25, 0x6f, 0x3b, 0xc6, 0xa7, 0xd8, 0x91, 0x8f, 0xb4, + 0xe3, 0x2e, 0x48, 0x9c, 0x00, 0xb5, 0x57, 0x3e, 0x04, 0xb2, 0x93, 0x78, 0x15, 0x4a, 0xe0, 0xc2, + 0xa5, 0x6a, 0x1f, 0xff, 0x1e, 0xbf, 0x7f, 0x6b, 0xb4, 0xe7, 0xb1, 0x90, 0x80, 0x3b, 0x01, 0x63, + 0xf1, 0xec, 0xe0, 0xc5, 0x27, 0x03, 0x2e, 0x62, 0x92, 0x1a, 0x64, 0x41, 0xc7, 0x24, 0xf2, 0x88, + 0x1e, 0x27, 0x0c, 0x18, 0x6e, 0x17, 0x90, 0x2e, 0x20, 0x5d, 0x40, 0xdd, 0xb6, 0xcf, 0x7c, 0x26, + 0x00, 0x83, 0x7f, 0xcb, 0xd8, 0x6e, 0xcf, 0x67, 0xcc, 0x0f, 0x88, 0x21, 0x7e, 0xb9, 0xf3, 0x89, + 0x01, 0x34, 0x24, 0x29, 0x38, 0x61, 0x9c, 0x03, 0xfd, 0xd2, 0x88, 0xe2, 0x33, 0x27, 0x1e, 0x95, + 0x12, 0x0b, 0x27, 0xa0, 0x63, 0x07, 0x58, 0x92, 0x51, 0x83, 0x5f, 0x0a, 0x6a, 0x1d, 0xe5, 0x79, + 0x62, 0x82, 0x1e, 0x8c, 0xe7, 0x71, 0x40, 0x3d, 0x07, 0x88, 0xbd, 0x60, 0x40, 0xec, 0xa2, 0x84, + 0x8e, 0xd2, 0x57, 0x86, 0x9b, 0xfb, 0x4f, 0xf4, 0xb2, 0x1a, 0xf4, 0x37, 0x85, 0x69, 0xc4, 0x80, + 0x14, 0xb7, 0x1d, 0xd7, 0xac, 0x9d, 0x71, 0xd9, 0x01, 0x4e, 0xd0, 0xc3, 0x80, 0xfa, 0x53, 0xb0, + 0xbd, 0x80, 0x92, 0x08, 0x6c, 0x07, 0xc0, 0xf1, 0x66, 0x37, 0xb1, 0xea, 0x22, 0x96, 0x51, 0x1e, + 0xeb, 0x84, 0x3b, 0x5f, 0x0b, 0xe3, 0xa1, 0xf0, 0xad, 0xc5, 0xdb, 0x0d, 0xaa, 0x0e, 0xcd, 0x26, + 0x52, 0xd3, 0x79, 0x38, 0xf8, 0x52, 0x47, 0x3b, 0xa5, 0xd9, 0xe2, 0xe7, 0x68, 0x43, 0x54, 0xec, + 0xe4, 0xa5, 0x76, 0xcb, 0xc3, 0x73, 0x8f, 0xd5, 0xe4, 0xe4, 0xa1, 0xb4, 0xb8, 0x79, 0xc6, 0xff, + 0xb4, 0x98, 0xf8, 0x29, 0xc2, 0xc0, 0xc0, 0x09, 0x78, 0x77, 0x69, 0xe4, 0xdb, 0x31, 0x3b, 0x27, + 0x49, 0x47, 0xed, 0x2b, 0x43, 0xd5, 0xda, 0x16, 0x27, 0x23, 0x71, 0x70, 0xca, 0x75, 0xfc, 0x18, + 0xdd, 0x95, 0xf3, 0xca, 0xd1, 0x86, 0x40, 0xef, 0x48, 0x39, 0x03, 0x4d, 0x74, 0x4b, 0x2e, 0x48, + 0xa7, 0x99, 0x27, 0x93, 0xad, 0x90, 0x5e, 0xac, 0x90, 0x7e, 0x56, 0x10, 0x66, 0xeb, 0xea, 0x7b, + 0xaf, 0x76, 0xf9, 0xa3, 0xa7, 0x58, 0x37, 0xb6, 0xc1, 0xd7, 0x3a, 0xda, 0xad, 0x6c, 0x2e, 0x7e, + 0x87, 0xee, 0x79, 0x2c, 0x9a, 0x04, 0xd4, 0x13, 0x79, 0xbb, 0x01, 0xf3, 0x66, 0x79, 0xa7, 0xfa, + 0x7f, 0x19, 0x94, 0xc9, 0x39, 0x6b, 0x7b, 0xcd, 0x2a, 0x14, 0xbc, 0x87, 0x6e, 0x7b, 0x2c, 0x0c, + 0x59, 0x64, 0x4f, 0x09, 0xe7, 0x44, 0x07, 0x55, 0x6b, 0x2b, 0x13, 0x8f, 0x85, 0x86, 0x2d, 0xd4, + 0x76, 0x2f, 0x3e, 0x3b, 0x11, 0xd0, 0x88, 0xd8, 0xb2, 0xe2, 0xb4, 0xa3, 0xf6, 0xd5, 0xe1, 0xe6, + 0x7e, 0xaf, 0xa2, 0xdb, 0x05, 0x67, 0xdd, 0x97, 0x66, 0xa9, 0xa5, 0x15, 0x03, 0x68, 0x54, 0x0c, + 0xe0, 0x7f, 0xf4, 0xf5, 0x14, 0x6d, 0x15, 0x5d, 0x3c, 0xa1, 0x29, 0xe0, 0x57, 0xa8, 0xb5, 0xf6, + 0xaf, 0xe2, 0x95, 0x68, 0xe5, 0x95, 0xc8, 0xdd, 0x6d, 0xf0, 0x6b, 0x2d, 0xe9, 0x32, 0xcf, 0xae, + 0x96, 0x9a, 0x72, 0xbd, 0xd4, 0x94, 0x9f, 0x4b, 0x4d, 0xb9, 0x5c, 0x69, 0xb5, 0xeb, 0x95, 0x56, + 0xfb, 0xb6, 0xd2, 0x6a, 0x1f, 0x5f, 0xfa, 0x14, 0xa6, 0x73, 0x97, 0xdf, 0x67, 0xbc, 0xfd, 0x30, + 0x3a, 0x7a, 0x4f, 0xe0, 0x9c, 0x25, 0x33, 0xe3, 0x8f, 0xa7, 0x20, 0x7b, 0x6e, 0xa4, 0x28, 0xc2, + 0xb9, 0x1b, 0x42, 0x3d, 0xf8, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x38, 0xe2, 0xb3, 0xcc, 0x04, + 0x00, 0x00, } func (m *Evidence) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/evidence.proto b/proto/cometbft/v034x/types/evidence.proto similarity index 70% rename from proto/tendermint/types/evidence.proto rename to proto/cometbft/v034x/types/evidence.proto index 451b8dca3c7..66c5beaf684 100644 --- a/proto/tendermint/types/evidence.proto +++ b/proto/cometbft/v034x/types/evidence.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v034x.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/validator.proto"; +import "cometbft/v034x/types/types.proto"; +import "cometbft/v034x/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.v034x.types.Vote vote_a = 1; + cometbft.v034x.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.v034x.types.LightBlock conflicting_block = 1; int64 common_height = 2; - repeated tendermint.types.Validator byzantine_validators = 3; + repeated cometbft.v034x.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/v034x/types/params.pb.go similarity index 89% rename from proto/tendermint/types/params.pb.go rename to proto/cometbft/v034x/types/params.pb.go index d3deb576acc..d0966f9bcb1 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/cometbft/v034x/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/params.proto +// source: cometbft/v034x/types/params.proto package types @@ -40,7 +40,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_9adecb7d71e70fc3, []int{0} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -116,7 +116,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_9adecb7d71e70fc3, []int{1} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,7 +189,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_9adecb7d71e70fc3, []int{2} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -249,7 +249,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_9adecb7d71e70fc3, []int{3} } func (m *ValidatorParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -294,7 +294,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_9adecb7d71e70fc3, []int{4} } func (m *VersionParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,7 +342,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_9adecb7d71e70fc3, []int{5} } func (m *HashedParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -386,52 +386,53 @@ func (m *HashedParams) GetBlockMaxGas() 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") -} - -func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) } - -var fileDescriptor_e12598271a686f57 = []byte{ - // 537 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x31, 0x6f, 0xd3, 0x40, - 0x18, 0xcd, 0xd5, 0xa5, 0x4d, 0xbe, 0x34, 0x4d, 0x75, 0x42, 0x22, 0x14, 0xd5, 0x0e, 0x1e, 0x50, - 0x25, 0x24, 0x5b, 0x82, 0x01, 0xd1, 0xa5, 0xc2, 0x50, 0x15, 0x84, 0x82, 0x90, 0x05, 0x0c, 0x5d, - 0xac, 0x73, 0x72, 0xb8, 0x56, 0x73, 0x3e, 0xcb, 0x77, 0x8e, 0x92, 0x7f, 0xc1, 0xd8, 0xb1, 0x23, - 0xfc, 0x03, 0x7e, 0x42, 0xc7, 0x8e, 0x4c, 0x80, 0x92, 0x85, 0x9f, 0x81, 0x7c, 0xce, 0xe1, 0x38, - 0x65, 0xf3, 0x7d, 0xdf, 0x7b, 0xef, 0xfc, 0xde, 0xd3, 0xc1, 0x81, 0xa4, 0xc9, 0x88, 0x66, 0x2c, - 0x4e, 0xa4, 0x2b, 0x67, 0x29, 0x15, 0x6e, 0x4a, 0x32, 0xc2, 0x84, 0x93, 0x66, 0x5c, 0x72, 0xbc, - 0x57, 0xad, 0x1d, 0xb5, 0xde, 0xbf, 0x1b, 0xf1, 0x88, 0xab, 0xa5, 0x5b, 0x7c, 0x95, 0xb8, 0x7d, - 0x33, 0xe2, 0x3c, 0x1a, 0x53, 0x57, 0x9d, 0xc2, 0xfc, 0xb3, 0x3b, 0xca, 0x33, 0x22, 0x63, 0x9e, - 0x94, 0x7b, 0xfb, 0x72, 0x03, 0xba, 0x2f, 0x79, 0x22, 0x68, 0x22, 0x72, 0xf1, 0x5e, 0xdd, 0x80, - 0x9f, 0xc3, 0x9d, 0x70, 0xcc, 0x87, 0x17, 0x3d, 0xd4, 0x47, 0x87, 0xed, 0x27, 0x07, 0xce, 0xfa, - 0x5d, 0x8e, 0x57, 0xac, 0x4b, 0xb4, 0xb7, 0x79, 0xfd, 0xd3, 0x6a, 0xf8, 0x25, 0x03, 0x7b, 0xd0, - 0xa4, 0x93, 0x78, 0x44, 0x93, 0x21, 0xed, 0x6d, 0x28, 0x76, 0xff, 0x36, 0xfb, 0x64, 0x89, 0xa8, - 0x09, 0xfc, 0xe3, 0xe1, 0x13, 0x68, 0x4d, 0xc8, 0x38, 0x1e, 0x11, 0xc9, 0xb3, 0x9e, 0xa1, 0x44, - 0x1e, 0xde, 0x16, 0xf9, 0xa4, 0x21, 0x35, 0x95, 0x8a, 0x89, 0x8f, 0x61, 0x7b, 0x42, 0x33, 0x11, - 0xf3, 0xa4, 0xb7, 0xa9, 0x44, 0xac, 0xff, 0x88, 0x94, 0x80, 0x9a, 0x84, 0x66, 0xd9, 0x14, 0xda, - 0x2b, 0x3e, 0xf1, 0x03, 0x68, 0x31, 0x32, 0x0d, 0xc2, 0x99, 0xa4, 0x42, 0x25, 0x63, 0xf8, 0x4d, - 0x46, 0xa6, 0x5e, 0x71, 0xc6, 0xf7, 0x60, 0xbb, 0x58, 0x46, 0x44, 0x28, 0xdb, 0x86, 0xbf, 0xc5, - 0xc8, 0xf4, 0x94, 0x08, 0xdc, 0x87, 0x1d, 0x19, 0x33, 0x1a, 0xc4, 0x5c, 0x92, 0x80, 0x09, 0xe5, - 0xc7, 0xf0, 0xa1, 0x98, 0xbd, 0xe1, 0x92, 0x0c, 0x84, 0xfd, 0x0d, 0xc1, 0x6e, 0x3d, 0x11, 0xfc, - 0x18, 0x70, 0xa1, 0x46, 0x22, 0x1a, 0x24, 0x39, 0x0b, 0x54, 0xb4, 0xfa, 0xce, 0x2e, 0x23, 0xd3, - 0x17, 0x11, 0x7d, 0x97, 0x33, 0xf5, 0x73, 0x02, 0x0f, 0x60, 0x4f, 0x83, 0x75, 0xb7, 0xcb, 0xe8, - 0xef, 0x3b, 0x65, 0xf9, 0x8e, 0x2e, 0xdf, 0x79, 0xb5, 0x04, 0x78, 0xcd, 0xc2, 0xea, 0xe5, 0x2f, - 0x0b, 0xf9, 0xbb, 0xa5, 0x9e, 0xde, 0xd4, 0x6d, 0x1a, 0x75, 0x9b, 0xf6, 0x31, 0x74, 0xd7, 0x72, - 0xc7, 0x36, 0x74, 0xd2, 0x3c, 0x0c, 0x2e, 0xe8, 0x2c, 0x50, 0x99, 0xf6, 0x50, 0xdf, 0x38, 0x6c, - 0xf9, 0xed, 0x34, 0x0f, 0xdf, 0xd2, 0xd9, 0x87, 0x62, 0x74, 0xd4, 0xfc, 0x7e, 0x65, 0xa1, 0x3f, - 0x57, 0x16, 0xb2, 0x8f, 0xa0, 0x53, 0xcb, 0x1c, 0x5b, 0xd0, 0x26, 0x69, 0x1a, 0xe8, 0xa6, 0x0a, - 0x8f, 0x9b, 0x3e, 0x90, 0x34, 0x5d, 0xc2, 0x56, 0xb8, 0x67, 0xb0, 0xf3, 0x9a, 0x88, 0x73, 0x3a, - 0x5a, 0x52, 0x1f, 0x41, 0x57, 0x25, 0x13, 0xac, 0xd7, 0xd2, 0x51, 0xe3, 0x81, 0xee, 0xc6, 0x86, - 0x4e, 0x85, 0xab, 0x1a, 0x6a, 0x6b, 0xd4, 0x29, 0x11, 0xde, 0xc7, 0xaf, 0x73, 0x13, 0x5d, 0xcf, - 0x4d, 0x74, 0x33, 0x37, 0xd1, 0xef, 0xb9, 0x89, 0xbe, 0x2c, 0xcc, 0xc6, 0xcd, 0xc2, 0x6c, 0xfc, - 0x58, 0x98, 0x8d, 0xb3, 0x67, 0x51, 0x2c, 0xcf, 0xf3, 0xd0, 0x19, 0x72, 0xe6, 0xae, 0x3e, 0xcb, - 0xea, 0xb3, 0x7c, 0x77, 0xeb, 0x4f, 0x36, 0xdc, 0x52, 0xf3, 0xa7, 0x7f, 0x03, 0x00, 0x00, 0xff, - 0xff, 0xfe, 0xe0, 0x3d, 0x9c, 0xcd, 0x03, 0x00, 0x00, + proto.RegisterType((*ConsensusParams)(nil), "cometbft.v034x.types.ConsensusParams") + proto.RegisterType((*BlockParams)(nil), "cometbft.v034x.types.BlockParams") + proto.RegisterType((*EvidenceParams)(nil), "cometbft.v034x.types.EvidenceParams") + proto.RegisterType((*ValidatorParams)(nil), "cometbft.v034x.types.ValidatorParams") + proto.RegisterType((*VersionParams)(nil), "cometbft.v034x.types.VersionParams") + proto.RegisterType((*HashedParams)(nil), "cometbft.v034x.types.HashedParams") +} + +func init() { proto.RegisterFile("cometbft/v034x/types/params.proto", fileDescriptor_9adecb7d71e70fc3) } + +var fileDescriptor_9adecb7d71e70fc3 = []byte{ + // 559 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0xeb, 0xa5, 0x6c, 0xed, 0xdb, 0x75, 0x45, 0xd6, 0x24, 0xca, 0x90, 0xd2, 0x2e, 0xfc, + 0xd1, 0x24, 0xa4, 0x04, 0x31, 0x4e, 0x95, 0x10, 0xa2, 0x63, 0x8c, 0x69, 0xea, 0x84, 0x22, 0x34, + 0xc1, 0x2e, 0x91, 0xd3, 0x7a, 0x59, 0xd4, 0x26, 0x8e, 0x62, 0xa7, 0xb4, 0xdf, 0x82, 0x23, 0xc7, + 0x1d, 0xc7, 0x37, 0xe0, 0x23, 0xec, 0xb8, 0x23, 0x27, 0x40, 0xed, 0x85, 0x8f, 0x81, 0xe2, 0xd4, + 0xeb, 0x52, 0x75, 0xb7, 0xf8, 0xf5, 0xef, 0x79, 0x9c, 0xf7, 0x79, 0x6d, 0xd8, 0xee, 0xb2, 0x80, + 0x0a, 0xf7, 0x4c, 0x58, 0xc3, 0x17, 0xbb, 0xaf, 0x46, 0x96, 0x18, 0x47, 0x94, 0x5b, 0x11, 0x89, + 0x49, 0xc0, 0xcd, 0x28, 0x66, 0x82, 0xe1, 0x4d, 0x85, 0x98, 0x12, 0x31, 0x25, 0xb2, 0xb5, 0xe9, + 0x31, 0x8f, 0x49, 0xc0, 0x4a, 0xbf, 0x32, 0x76, 0x4b, 0xf7, 0x18, 0xf3, 0x06, 0xd4, 0x92, 0x2b, + 0x37, 0x39, 0xb3, 0x7a, 0x49, 0x4c, 0x84, 0xcf, 0xc2, 0x6c, 0xdf, 0xb8, 0x5c, 0x81, 0xda, 0x1e, + 0x0b, 0x39, 0x0d, 0x79, 0xc2, 0x3f, 0xca, 0x53, 0xf0, 0x6b, 0xb8, 0xe7, 0x0e, 0x58, 0xb7, 0x5f, + 0x47, 0x4d, 0xb4, 0x53, 0x79, 0xb9, 0x6d, 0x2e, 0x3b, 0xcf, 0x6c, 0xa7, 0x48, 0xa6, 0x68, 0x17, + 0xaf, 0x7e, 0x37, 0x0a, 0x76, 0xa6, 0xc2, 0xef, 0xa1, 0x44, 0x87, 0x7e, 0x8f, 0x86, 0x5d, 0x5a, + 0x5f, 0x91, 0x0e, 0x4f, 0x96, 0x3b, 0xec, 0xcf, 0xa8, 0x9c, 0xc9, 0x8d, 0x16, 0x1f, 0x42, 0x79, + 0x48, 0x06, 0x7e, 0x8f, 0x08, 0x16, 0xd7, 0x35, 0x69, 0xf4, 0x74, 0xb9, 0xd1, 0x89, 0xc2, 0x72, + 0x4e, 0x73, 0x35, 0xde, 0x83, 0xb5, 0x21, 0x8d, 0xb9, 0xcf, 0xc2, 0x7a, 0x51, 0x1a, 0x3d, 0xbe, + 0xc3, 0x28, 0x83, 0x72, 0x36, 0x4a, 0x69, 0x50, 0xa8, 0xdc, 0xea, 0x19, 0x3f, 0x82, 0x72, 0x40, + 0x46, 0x8e, 0x3b, 0x16, 0x94, 0xcb, 0xa4, 0x34, 0xbb, 0x14, 0x90, 0x51, 0x3b, 0x5d, 0xe3, 0x07, + 0xb0, 0x96, 0x6e, 0x7a, 0x84, 0xcb, 0x08, 0x34, 0x7b, 0x35, 0x20, 0xa3, 0x03, 0xc2, 0x71, 0x13, + 0xd6, 0x85, 0x1f, 0x50, 0xc7, 0x67, 0x82, 0x38, 0x01, 0x97, 0x7d, 0x69, 0x36, 0xa4, 0xb5, 0x43, + 0x26, 0x48, 0x87, 0x1b, 0x3f, 0x10, 0x6c, 0xe4, 0x93, 0xc1, 0xcf, 0x01, 0xa7, 0x6e, 0xc4, 0xa3, + 0x4e, 0x98, 0x04, 0x8e, 0x8c, 0x59, 0x9d, 0x59, 0x0b, 0xc8, 0xe8, 0xad, 0x47, 0x8f, 0x93, 0x40, + 0xfe, 0x1c, 0xc7, 0x1d, 0xb8, 0xaf, 0x60, 0x35, 0xeb, 0xd9, 0x18, 0x1e, 0x9a, 0xd9, 0x65, 0x30, + 0xd5, 0x65, 0x30, 0xdf, 0xcd, 0x80, 0x76, 0x29, 0x6d, 0xf5, 0xfb, 0x9f, 0x06, 0xb2, 0x37, 0x32, + 0x3f, 0xb5, 0x93, 0x6f, 0x53, 0xcb, 0xb7, 0x69, 0xbc, 0x81, 0xda, 0x42, 0xf6, 0xd8, 0x80, 0x6a, + 0x94, 0xb8, 0x4e, 0x9f, 0x8e, 0x1d, 0x99, 0x69, 0x1d, 0x35, 0xb5, 0x9d, 0xb2, 0x5d, 0x89, 0x12, + 0xf7, 0x88, 0x8e, 0x3f, 0xa5, 0xa5, 0x56, 0xe9, 0xe7, 0x45, 0x03, 0xfd, 0xbb, 0x68, 0x20, 0xa3, + 0x05, 0xd5, 0x5c, 0xe6, 0xb8, 0x01, 0x15, 0x12, 0x45, 0x8e, 0x9a, 0x56, 0xda, 0x63, 0xd1, 0x06, + 0x12, 0x45, 0x33, 0xec, 0x96, 0xf6, 0x14, 0xd6, 0x3f, 0x10, 0x7e, 0x4e, 0x7b, 0x33, 0xe9, 0x33, + 0xa8, 0xc9, 0x64, 0x9c, 0xc5, 0xb1, 0x54, 0x65, 0xb9, 0xa3, 0x66, 0x63, 0x40, 0x75, 0xce, 0xcd, + 0x27, 0x54, 0x51, 0xd4, 0x01, 0xe1, 0xed, 0xcf, 0x97, 0x13, 0x1d, 0x5d, 0x4d, 0x74, 0x74, 0x3d, + 0xd1, 0xd1, 0xdf, 0x89, 0x8e, 0xbe, 0x4d, 0xf5, 0xc2, 0xf5, 0x54, 0x2f, 0xfc, 0x9a, 0xea, 0x85, + 0xd3, 0x96, 0xe7, 0x8b, 0xf3, 0xc4, 0x4d, 0xef, 0x90, 0x75, 0xf4, 0xe5, 0x64, 0xff, 0x98, 0x8a, + 0xaf, 0x2c, 0xee, 0x5b, 0x0b, 0x4f, 0x37, 0x7b, 0x8c, 0x37, 0x45, 0x19, 0x87, 0xbb, 0x2a, 0xab, + 0xbb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x09, 0xcd, 0x83, 0xcc, 0xe8, 0x03, 0x00, 0x00, } func (this *ConsensusParams) Equal(that interface{}) bool { diff --git a/proto/tendermint/types/params.proto b/proto/cometbft/v034x/types/params.proto similarity index 95% rename from proto/tendermint/types/params.proto rename to proto/cometbft/v034x/types/params.proto index 0de7d846fbd..554b26862e3 100644 --- a/proto/tendermint/types/params.proto +++ b/proto/cometbft/v034x/types/params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v034x.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/tendermint/types/types.pb.go b/proto/cometbft/v034x/types/types.pb.go similarity index 90% rename from proto/tendermint/types/types.pb.go rename to proto/cometbft/v034x/types/types.pb.go index 6bf38239431..523c4135fcb 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/cometbft/v034x/types/types.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/types.proto +// source: cometbft/v034x/types/types.proto package types import ( fmt "fmt" + crypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" + version "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - version "github.com/tendermint/tendermint/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -58,7 +58,7 @@ func (x BlockIDFlag) String() string { } func (BlockIDFlag) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{0} + return fileDescriptor_83613234746c75b1, []int{0} } // SignedMsgType is a type of signed message in the consensus. @@ -92,7 +92,7 @@ func (x SignedMsgType) String() string { } func (SignedMsgType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{1} + return fileDescriptor_83613234746c75b1, []int{1} } // PartsetHeader @@ -105,7 +105,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_83613234746c75b1, []int{0} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -158,7 +158,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_83613234746c75b1, []int{1} } func (m *Part) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -218,7 +218,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_83613234746c75b1, []int{2} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -288,7 +288,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_83613234746c75b1, []int{3} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -427,7 +427,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_83613234746c75b1, []int{4} } func (m *Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -466,7 +466,7 @@ func (m *Data) GetTxs() [][]byte { // Vote represents a prevote, precommit, or commit 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.v034x.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"` @@ -480,7 +480,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_83613234746c75b1, []int{5} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -577,7 +577,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_83613234746c75b1, []int{6} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -636,7 +636,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.v034x.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"` @@ -646,7 +646,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_83613234746c75b1, []int{7} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -704,7 +704,7 @@ func (m *CommitSig) GetSignature() []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.v034x.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"` @@ -717,7 +717,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{8} + return fileDescriptor_83613234746c75b1, []int{8} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -804,7 +804,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{9} + return fileDescriptor_83613234746c75b1, []int{9} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -856,7 +856,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{10} + return fileDescriptor_83613234746c75b1, []int{10} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -910,7 +910,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{11} + return fileDescriptor_83613234746c75b1, []int{11} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -978,7 +978,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{12} + return fileDescriptor_83613234746c75b1, []int{12} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1029,110 +1029,111 @@ func (m *TxProof) GetProof() *crypto.Proof { } func init() { - proto.RegisterEnum("tendermint.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value) - 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((*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{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xda, 0x9b, 0xd8, 0x7e, 0xb6, 0x13, 0x67, 0x95, 0xb6, 0xae, 0xdb, 0x38, 0x2b, 0x23, - 0x20, 0x2d, 0x68, 0x53, 0x52, 0xc4, 0x9f, 0x03, 0x07, 0xdb, 0x49, 0x5b, 0xab, 0x89, 0x63, 0xd6, - 0x6e, 0x11, 0x5c, 0x56, 0x6b, 0xef, 0xd4, 0x5e, 0xba, 0xde, 0x59, 0xed, 0x8c, 0x43, 0xd2, 0x4f, - 0x80, 0x72, 0xea, 0x89, 0x5b, 0x4e, 0x70, 0xe0, 0xce, 0x17, 0x40, 0x9c, 0x7a, 0xec, 0x0d, 0x2e, - 0x14, 0x94, 0x4a, 0x88, 0x8f, 0x81, 0xe6, 0x8f, 0xd7, 0xeb, 0x38, 0x86, 0xaa, 0xaa, 0xb8, 0x58, - 0x3b, 0xef, 0xfd, 0xde, 0xcc, 0x7b, 0xbf, 0xf7, 0x9b, 0x3f, 0x86, 0xeb, 0x14, 0xf9, 0x0e, 0x0a, - 0x87, 0xae, 0x4f, 0xb7, 0xe8, 0x71, 0x80, 0x88, 0xf8, 0x35, 0x82, 0x10, 0x53, 0xac, 0x15, 0x26, - 0x5e, 0x83, 0xdb, 0x4b, 0x6b, 0x7d, 0xdc, 0xc7, 0xdc, 0xb9, 0xc5, 0xbe, 0x04, 0xae, 0xb4, 0xd1, - 0xc7, 0xb8, 0xef, 0xa1, 0x2d, 0x3e, 0xea, 0x8e, 0x1e, 0x6d, 0x51, 0x77, 0x88, 0x08, 0xb5, 0x87, - 0x81, 0x04, 0xac, 0xc7, 0x96, 0xe9, 0x85, 0xc7, 0x01, 0xc5, 0x0c, 0x8b, 0x1f, 0x49, 0x77, 0x39, - 0xe6, 0x3e, 0x44, 0x21, 0x71, 0xb1, 0x1f, 0xcf, 0xa3, 0xa4, 0xcf, 0x64, 0x79, 0x68, 0x7b, 0xae, - 0x63, 0x53, 0x1c, 0x0a, 0x44, 0xe5, 0x53, 0xc8, 0xb7, 0xec, 0x90, 0xb6, 0x11, 0xbd, 0x87, 0x6c, - 0x07, 0x85, 0xda, 0x1a, 0x2c, 0x52, 0x4c, 0x6d, 0xaf, 0xa8, 0xe8, 0xca, 0x66, 0xde, 0x14, 0x03, - 0x4d, 0x03, 0x75, 0x60, 0x93, 0x41, 0x31, 0xa1, 0x2b, 0x9b, 0x39, 0x93, 0x7f, 0x57, 0x06, 0xa0, - 0xb2, 0x50, 0x16, 0xe1, 0xfa, 0x0e, 0x3a, 0x1a, 0x47, 0xf0, 0x01, 0xb3, 0x76, 0x8f, 0x29, 0x22, - 0x32, 0x44, 0x0c, 0xb4, 0x0f, 0x61, 0x91, 0xe7, 0x5f, 0x4c, 0xea, 0xca, 0x66, 0x76, 0xbb, 0x68, - 0xc4, 0x88, 0x12, 0xf5, 0x19, 0x2d, 0xe6, 0xaf, 0xa9, 0xcf, 0x5e, 0x6c, 0x2c, 0x98, 0x02, 0x5c, - 0xf1, 0x20, 0x55, 0xf3, 0x70, 0xef, 0x71, 0x63, 0x27, 0x4a, 0x44, 0x99, 0x24, 0xa2, 0xed, 0xc3, - 0x4a, 0x60, 0x87, 0xd4, 0x22, 0x88, 0x5a, 0x03, 0x5e, 0x05, 0x5f, 0x34, 0xbb, 0xbd, 0x61, 0x9c, - 0xef, 0x83, 0x31, 0x55, 0xac, 0x5c, 0x25, 0x1f, 0xc4, 0x8d, 0x95, 0xbf, 0x54, 0x58, 0x92, 0x64, - 0x7c, 0x06, 0x29, 0x49, 0x2b, 0x5f, 0x30, 0xbb, 0xbd, 0x1e, 0x9f, 0x51, 0xba, 0x8c, 0x3a, 0xf6, - 0x09, 0xf2, 0xc9, 0x88, 0xc8, 0xf9, 0xc6, 0x31, 0xda, 0x3b, 0x90, 0xee, 0x0d, 0x6c, 0xd7, 0xb7, - 0x5c, 0x87, 0x67, 0x94, 0xa9, 0x65, 0xcf, 0x5e, 0x6c, 0xa4, 0xea, 0xcc, 0xd6, 0xd8, 0x31, 0x53, - 0xdc, 0xd9, 0x70, 0xb4, 0xcb, 0xb0, 0x34, 0x40, 0x6e, 0x7f, 0x40, 0x39, 0x2d, 0x49, 0x53, 0x8e, - 0xb4, 0x4f, 0x40, 0x65, 0x82, 0x28, 0xaa, 0x7c, 0xed, 0x92, 0x21, 0xd4, 0x62, 0x8c, 0xd5, 0x62, - 0x74, 0xc6, 0x6a, 0xa9, 0xa5, 0xd9, 0xc2, 0x4f, 0xff, 0xd8, 0x50, 0x4c, 0x1e, 0xa1, 0xd5, 0x21, - 0xef, 0xd9, 0x84, 0x5a, 0x5d, 0x46, 0x1b, 0x5b, 0x7e, 0x91, 0x4f, 0x71, 0x75, 0x96, 0x10, 0x49, - 0xac, 0x4c, 0x3d, 0xcb, 0xa2, 0x84, 0xc9, 0xd1, 0x36, 0xa1, 0xc0, 0x27, 0xe9, 0xe1, 0xe1, 0xd0, - 0xa5, 0x16, 0xe7, 0x7d, 0x89, 0xf3, 0xbe, 0xcc, 0xec, 0x75, 0x6e, 0xbe, 0xc7, 0x3a, 0x70, 0x0d, - 0x32, 0x8e, 0x4d, 0x6d, 0x01, 0x49, 0x71, 0x48, 0x9a, 0x19, 0xb8, 0xf3, 0x5d, 0x58, 0x89, 0x54, - 0x47, 0x04, 0x24, 0x2d, 0x66, 0x99, 0x98, 0x39, 0xf0, 0x16, 0xac, 0xf9, 0xe8, 0x88, 0x5a, 0xe7, - 0xd1, 0x19, 0x8e, 0xd6, 0x98, 0xef, 0xe1, 0x74, 0xc4, 0xdb, 0xb0, 0xdc, 0x1b, 0x93, 0x2f, 0xb0, - 0xc0, 0xb1, 0xf9, 0xc8, 0xca, 0x61, 0x57, 0x21, 0x6d, 0x07, 0x81, 0x00, 0x64, 0x39, 0x20, 0x65, - 0x07, 0x01, 0x77, 0xdd, 0x84, 0x55, 0x5e, 0x63, 0x88, 0xc8, 0xc8, 0xa3, 0x72, 0x92, 0x1c, 0xc7, - 0xac, 0x30, 0x87, 0x29, 0xec, 0x1c, 0xfb, 0x16, 0xe4, 0xd1, 0xa1, 0xeb, 0x20, 0xbf, 0x87, 0x04, - 0x2e, 0xcf, 0x71, 0xb9, 0xb1, 0x91, 0x83, 0x6e, 0x40, 0x21, 0x08, 0x71, 0x80, 0x09, 0x0a, 0x2d, - 0xdb, 0x71, 0x42, 0x44, 0x48, 0x71, 0x59, 0xcc, 0x37, 0xb6, 0x57, 0x85, 0xb9, 0x52, 0x04, 0x75, - 0xc7, 0xa6, 0xb6, 0x56, 0x80, 0x24, 0x3d, 0x22, 0x45, 0x45, 0x4f, 0x6e, 0xe6, 0x4c, 0xf6, 0x59, - 0xf9, 0x3b, 0x01, 0xea, 0x43, 0x4c, 0x91, 0x76, 0x1b, 0x54, 0xd6, 0x26, 0xae, 0xbe, 0xe5, 0x8b, - 0xf4, 0xdc, 0x76, 0xfb, 0x3e, 0x72, 0xf6, 0x49, 0xbf, 0x73, 0x1c, 0x20, 0x93, 0x83, 0x63, 0x72, - 0x4a, 0x4c, 0xc9, 0x69, 0x0d, 0x16, 0x43, 0x3c, 0xf2, 0x1d, 0xae, 0xb2, 0x45, 0x53, 0x0c, 0xb4, - 0x5d, 0x48, 0x47, 0x2a, 0x51, 0xff, 0x4b, 0x25, 0x2b, 0x4c, 0x25, 0x4c, 0xc3, 0xd2, 0x60, 0xa6, - 0xba, 0x52, 0x2c, 0x35, 0xc8, 0x44, 0x87, 0x97, 0x54, 0xdb, 0xab, 0x09, 0x76, 0x12, 0xa6, 0xbd, - 0x07, 0xab, 0x51, 0xef, 0x23, 0xf2, 0x84, 0xe2, 0x0a, 0x91, 0x43, 0xb2, 0x37, 0x25, 0x2b, 0x4b, - 0x1c, 0x40, 0x29, 0x5e, 0xd7, 0x44, 0x56, 0x0d, 0x7e, 0x12, 0x5d, 0x87, 0x0c, 0x71, 0xfb, 0xbe, - 0x4d, 0x47, 0x21, 0x92, 0xca, 0x9b, 0x18, 0x2a, 0x3f, 0x2b, 0xb0, 0x24, 0x94, 0x1c, 0xe3, 0x4d, - 0xb9, 0x98, 0xb7, 0xc4, 0x3c, 0xde, 0x92, 0xaf, 0xcf, 0x5b, 0x15, 0x20, 0x4a, 0x86, 0x14, 0x55, - 0x3d, 0xb9, 0x99, 0xdd, 0xbe, 0x36, 0x3b, 0x91, 0x48, 0xb1, 0xed, 0xf6, 0xe5, 0x46, 0x8d, 0x05, - 0x55, 0x7e, 0x57, 0x20, 0x13, 0xf9, 0xb5, 0x2a, 0xe4, 0xc7, 0x79, 0x59, 0x8f, 0x3c, 0xbb, 0x2f, - 0xb5, 0xb3, 0x3e, 0x37, 0xb9, 0x3b, 0x9e, 0xdd, 0x37, 0xb3, 0x32, 0x1f, 0x36, 0xb8, 0xb8, 0x0f, - 0x89, 0x39, 0x7d, 0x98, 0x6a, 0x7c, 0xf2, 0xf5, 0x1a, 0x3f, 0xd5, 0x22, 0xf5, 0x7c, 0x8b, 0x7e, - 0x4a, 0x40, 0xba, 0xc5, 0xf7, 0x8e, 0xed, 0xfd, 0x1f, 0x3b, 0xe2, 0x1a, 0x64, 0x02, 0xec, 0x59, - 0xc2, 0xa3, 0x72, 0x4f, 0x3a, 0xc0, 0x9e, 0x39, 0xd3, 0xf6, 0xc5, 0x37, 0xb4, 0x5d, 0x96, 0xde, - 0x00, 0x6b, 0xa9, 0xf3, 0xac, 0x85, 0x90, 0x13, 0x54, 0xc8, 0xbb, 0xec, 0x16, 0xe3, 0x80, 0x5f, - 0x8e, 0xca, 0xec, 0xdd, 0x2b, 0xd2, 0x16, 0x48, 0x53, 0xe2, 0x58, 0x84, 0x38, 0xfa, 0xe5, 0x75, - 0x5a, 0x9c, 0x27, 0x4b, 0x53, 0xe2, 0x2a, 0xdf, 0x29, 0x00, 0x7b, 0x8c, 0x59, 0x5e, 0x2f, 0xbb, - 0x85, 0x08, 0x4f, 0xc1, 0x9a, 0x5a, 0xb9, 0x3c, 0xaf, 0x69, 0x72, 0xfd, 0x1c, 0x89, 0xe7, 0x5d, - 0x87, 0xfc, 0x44, 0x8c, 0x04, 0x8d, 0x93, 0xb9, 0x60, 0x92, 0xe8, 0x72, 0x68, 0x23, 0x6a, 0xe6, - 0x0e, 0x63, 0xa3, 0xca, 0x2f, 0x0a, 0x64, 0x78, 0x4e, 0xfb, 0x88, 0xda, 0x53, 0x3d, 0x54, 0x5e, - 0xbf, 0x87, 0xeb, 0x00, 0x62, 0x1a, 0xe2, 0x3e, 0x41, 0x52, 0x59, 0x19, 0x6e, 0x69, 0xbb, 0x4f, - 0x90, 0xf6, 0x51, 0x44, 0x78, 0xf2, 0xdf, 0x09, 0x97, 0x5b, 0x7a, 0x4c, 0xfb, 0x15, 0x48, 0xf9, - 0xa3, 0xa1, 0xc5, 0xae, 0x04, 0x55, 0xa8, 0xd5, 0x1f, 0x0d, 0x3b, 0x47, 0xa4, 0xf2, 0x35, 0xa4, - 0x3a, 0x47, 0xfc, 0x79, 0xc4, 0x24, 0x1a, 0x62, 0x2c, 0xef, 0x64, 0xf1, 0x16, 0x4a, 0x33, 0x03, - 0xbf, 0x82, 0x34, 0x50, 0xd9, 0xe5, 0x3b, 0x7e, 0xac, 0xb1, 0x6f, 0xcd, 0x78, 0xc5, 0x87, 0x97, - 0x7c, 0x72, 0xdd, 0xfc, 0x55, 0x81, 0x6c, 0xec, 0x7c, 0xd0, 0x3e, 0x80, 0x4b, 0xb5, 0xbd, 0x83, - 0xfa, 0x7d, 0xab, 0xb1, 0x63, 0xdd, 0xd9, 0xab, 0xde, 0xb5, 0x1e, 0x34, 0xef, 0x37, 0x0f, 0xbe, - 0x68, 0x16, 0x16, 0x4a, 0x97, 0x4f, 0x4e, 0x75, 0x2d, 0x86, 0x7d, 0xe0, 0x3f, 0xf6, 0xf1, 0x37, - 0xbe, 0xb6, 0x05, 0x6b, 0xd3, 0x21, 0xd5, 0x5a, 0x7b, 0xb7, 0xd9, 0x29, 0x28, 0xa5, 0x4b, 0x27, - 0xa7, 0xfa, 0x6a, 0x2c, 0xa2, 0xda, 0x25, 0xc8, 0xa7, 0xb3, 0x01, 0xf5, 0x83, 0xfd, 0xfd, 0x46, - 0xa7, 0x90, 0x98, 0x09, 0x90, 0x07, 0xf6, 0x0d, 0x58, 0x9d, 0x0e, 0x68, 0x36, 0xf6, 0x0a, 0xc9, - 0x92, 0x76, 0x72, 0xaa, 0x2f, 0xc7, 0xd0, 0x4d, 0xd7, 0x2b, 0xa5, 0xbf, 0xfd, 0xbe, 0xbc, 0xf0, - 0xe3, 0x0f, 0x65, 0x85, 0x55, 0x96, 0x9f, 0x3a, 0x23, 0xb4, 0xf7, 0xe1, 0x4a, 0xbb, 0x71, 0xb7, - 0xb9, 0xbb, 0x63, 0xed, 0xb7, 0xef, 0x5a, 0x9d, 0x2f, 0x5b, 0xbb, 0xb1, 0xea, 0x56, 0x4e, 0x4e, - 0xf5, 0xac, 0x2c, 0x69, 0x1e, 0xba, 0x65, 0xee, 0x3e, 0x3c, 0xe8, 0xec, 0x16, 0x14, 0x81, 0x6e, - 0x85, 0xe8, 0x10, 0x53, 0xc4, 0xd1, 0xb7, 0xe0, 0xea, 0x05, 0xe8, 0xa8, 0xb0, 0xd5, 0x93, 0x53, - 0x3d, 0xdf, 0x0a, 0x91, 0xd8, 0x3f, 0x3c, 0xc2, 0x80, 0xe2, 0x6c, 0xc4, 0x41, 0xeb, 0xa0, 0x5d, - 0xdd, 0x2b, 0xe8, 0xa5, 0xc2, 0xc9, 0xa9, 0x9e, 0x1b, 0x1f, 0x86, 0x0c, 0x3f, 0xa9, 0xac, 0xf6, - 0xf9, 0xb3, 0xb3, 0xb2, 0xf2, 0xfc, 0xac, 0xac, 0xfc, 0x79, 0x56, 0x56, 0x9e, 0xbe, 0x2c, 0x2f, - 0x3c, 0x7f, 0x59, 0x5e, 0xf8, 0xed, 0x65, 0x79, 0xe1, 0xab, 0x8f, 0xfb, 0x2e, 0x1d, 0x8c, 0xba, - 0x46, 0x0f, 0x0f, 0xb7, 0xe2, 0x7f, 0x09, 0x26, 0x9f, 0xe2, 0xaf, 0xc9, 0xf9, 0xbf, 0x0b, 0xdd, - 0x25, 0x6e, 0xbf, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x78, 0x43, 0xdf, 0xef, 0x0c, - 0x00, 0x00, + proto.RegisterEnum("cometbft.v034x.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value) + proto.RegisterEnum("cometbft.v034x.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value) + proto.RegisterType((*PartSetHeader)(nil), "cometbft.v034x.types.PartSetHeader") + proto.RegisterType((*Part)(nil), "cometbft.v034x.types.Part") + proto.RegisterType((*BlockID)(nil), "cometbft.v034x.types.BlockID") + proto.RegisterType((*Header)(nil), "cometbft.v034x.types.Header") + proto.RegisterType((*Data)(nil), "cometbft.v034x.types.Data") + proto.RegisterType((*Vote)(nil), "cometbft.v034x.types.Vote") + proto.RegisterType((*Commit)(nil), "cometbft.v034x.types.Commit") + proto.RegisterType((*CommitSig)(nil), "cometbft.v034x.types.CommitSig") + proto.RegisterType((*Proposal)(nil), "cometbft.v034x.types.Proposal") + proto.RegisterType((*SignedHeader)(nil), "cometbft.v034x.types.SignedHeader") + proto.RegisterType((*LightBlock)(nil), "cometbft.v034x.types.LightBlock") + proto.RegisterType((*BlockMeta)(nil), "cometbft.v034x.types.BlockMeta") + proto.RegisterType((*TxProof)(nil), "cometbft.v034x.types.TxProof") +} + +func init() { proto.RegisterFile("cometbft/v034x/types/types.proto", fileDescriptor_83613234746c75b1) } + +var fileDescriptor_83613234746c75b1 = []byte{ + // 1333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x72, 0x13, 0xc7, + 0x13, 0xf7, 0x5a, 0x6b, 0x4b, 0x6a, 0x49, 0xb6, 0xbc, 0x65, 0x40, 0x08, 0x90, 0x85, 0xf8, 0xff, + 0x13, 0x43, 0x52, 0x12, 0x31, 0x54, 0x85, 0x70, 0xb3, 0x6c, 0x61, 0x54, 0xd8, 0xb2, 0xb2, 0x12, + 0x4e, 0x91, 0xcb, 0xd6, 0x4a, 0x1a, 0x4b, 0x5b, 0xac, 0x76, 0xb6, 0x76, 0x47, 0xc6, 0xe6, 0x09, + 0x52, 0x3e, 0xf1, 0x02, 0xce, 0x25, 0x39, 0xe4, 0x1d, 0xf2, 0x02, 0x54, 0x4e, 0xdc, 0x92, 0x13, + 0x49, 0xcc, 0x3d, 0x95, 0x47, 0x48, 0x4d, 0xcf, 0xec, 0xea, 0xc3, 0x32, 0x21, 0x81, 0xca, 0x45, + 0xb5, 0xd3, 0xfd, 0xeb, 0x9e, 0xfe, 0xf8, 0xcd, 0xf4, 0x08, 0xf2, 0x6d, 0xda, 0x27, 0xac, 0xb5, + 0xcf, 0x4a, 0x07, 0xb7, 0xef, 0xdc, 0x3d, 0x2c, 0xb1, 0x23, 0x97, 0xf8, 0xe2, 0xb7, 0xe8, 0x7a, + 0x94, 0x51, 0x6d, 0x39, 0x40, 0x14, 0x11, 0x51, 0x44, 0x5d, 0x76, 0xb9, 0x4b, 0xbb, 0x14, 0x01, + 0x25, 0xfe, 0x25, 0xb0, 0xd9, 0x95, 0x2e, 0xa5, 0x5d, 0x9b, 0x94, 0x70, 0xd5, 0x1a, 0xec, 0x97, + 0x98, 0xd5, 0x27, 0x3e, 0x33, 0xfb, 0xae, 0x04, 0x5c, 0x9f, 0xd8, 0xae, 0xed, 0x1d, 0xb9, 0x8c, + 0x72, 0x3c, 0xdd, 0x97, 0x90, 0xc2, 0x04, 0xe4, 0x80, 0x78, 0xbe, 0x45, 0x9d, 0xd1, 0x98, 0xb2, + 0xff, 0x9b, 0x1a, 0xf5, 0x81, 0x69, 0x5b, 0x1d, 0x93, 0x51, 0x4f, 0xa0, 0x0a, 0x5f, 0x40, 0xaa, + 0x6e, 0x7a, 0xac, 0x41, 0xd8, 0x43, 0x62, 0x76, 0x88, 0xa7, 0x2d, 0xc3, 0x1c, 0xa3, 0xcc, 0xb4, + 0x33, 0x4a, 0x5e, 0x59, 0x4d, 0xe9, 0x62, 0xa1, 0x69, 0xa0, 0xf6, 0x4c, 0xbf, 0x97, 0x99, 0xcd, + 0x2b, 0xab, 0x49, 0x1d, 0xbf, 0x0b, 0x36, 0xa8, 0xdc, 0x94, 0x5b, 0x58, 0x4e, 0x87, 0x1c, 0x06, + 0x16, 0xb8, 0xe0, 0xd2, 0xd6, 0x11, 0x23, 0xbe, 0x34, 0x11, 0x0b, 0xed, 0x1e, 0xcc, 0x61, 0x1e, + 0x99, 0x48, 0x5e, 0x59, 0x4d, 0xac, 0x5d, 0x2d, 0x4e, 0x14, 0x4e, 0xe4, 0x5a, 0xac, 0x73, 0x4c, + 0x59, 0x7d, 0xf9, 0x7a, 0x65, 0x46, 0x17, 0x06, 0x05, 0x17, 0xa2, 0x65, 0x9b, 0xb6, 0x9f, 0x56, + 0x37, 0xc3, 0x60, 0x94, 0x61, 0x30, 0xda, 0x97, 0xb0, 0xe8, 0x9a, 0x1e, 0x33, 0x7c, 0xc2, 0x8c, + 0x1e, 0x66, 0x82, 0x1b, 0x27, 0xd6, 0x6e, 0x14, 0xa7, 0xf5, 0xa6, 0x38, 0x96, 0xb4, 0xdc, 0x29, + 0xe5, 0x8e, 0x0a, 0x0b, 0x7f, 0xa8, 0x30, 0x2f, 0x8b, 0xb2, 0x0e, 0x51, 0x59, 0x62, 0xdc, 0x34, + 0xb1, 0x76, 0x7d, 0xd2, 0xab, 0x54, 0x17, 0x37, 0xa8, 0xe3, 0x13, 0xc7, 0x1f, 0xf8, 0xd2, 0x67, + 0x60, 0xa7, 0x7d, 0x04, 0xb1, 0x76, 0xcf, 0xb4, 0x1c, 0xc3, 0xea, 0x60, 0x64, 0xf1, 0x72, 0xe2, + 0xf4, 0xf5, 0x4a, 0x74, 0x83, 0xcb, 0xaa, 0x9b, 0x7a, 0x14, 0x95, 0xd5, 0x8e, 0x76, 0x11, 0xe6, + 0x7b, 0xc4, 0xea, 0xf6, 0x18, 0x96, 0x28, 0xa2, 0xcb, 0x95, 0x76, 0x0f, 0x54, 0x4e, 0x94, 0x8c, + 0x8a, 0xfb, 0x67, 0x8b, 0x82, 0x45, 0xc5, 0x80, 0x45, 0xc5, 0x66, 0xc0, 0xa2, 0x72, 0x8c, 0x6f, + 0xfc, 0xe2, 0xd7, 0x15, 0x45, 0x47, 0x0b, 0x6d, 0x0b, 0x52, 0xb6, 0xe9, 0x33, 0xa3, 0xc5, 0xcb, + 0xc7, 0xb7, 0x9f, 0x43, 0x17, 0xd7, 0xa6, 0x17, 0x46, 0x16, 0x59, 0x86, 0x9f, 0xe0, 0x96, 0x42, + 0xd4, 0xd1, 0x56, 0x21, 0x8d, 0x8e, 0xda, 0xb4, 0xdf, 0xb7, 0x98, 0x81, 0x3d, 0x98, 0xc7, 0x1e, + 0x2c, 0x70, 0xf9, 0x06, 0x8a, 0x1f, 0xf2, 0x6e, 0x5c, 0x81, 0x78, 0xc7, 0x64, 0xa6, 0x80, 0x44, + 0x11, 0x12, 0xe3, 0x02, 0x54, 0x7e, 0x0c, 0x8b, 0x21, 0x0b, 0x7d, 0x01, 0x89, 0x09, 0x2f, 0x43, + 0x31, 0x02, 0x6f, 0xc3, 0xb2, 0x43, 0x0e, 0x99, 0x31, 0x89, 0x8e, 0x23, 0x5a, 0xe3, 0xba, 0xbd, + 0x71, 0x8b, 0xff, 0xc3, 0x42, 0x3b, 0x68, 0x80, 0xc0, 0x02, 0x62, 0x53, 0xa1, 0x14, 0x61, 0x97, + 0x21, 0x66, 0xba, 0xae, 0x00, 0x24, 0x10, 0x10, 0x35, 0x5d, 0x17, 0x55, 0xb7, 0x60, 0x09, 0x73, + 0xf4, 0x88, 0x3f, 0xb0, 0x99, 0x74, 0x92, 0x44, 0xcc, 0x22, 0x57, 0xe8, 0x42, 0x8e, 0xd8, 0x1b, + 0x90, 0x22, 0x07, 0x56, 0x87, 0x38, 0x6d, 0x22, 0x70, 0x29, 0xc4, 0x25, 0x03, 0x21, 0x82, 0x6e, + 0x42, 0xda, 0xf5, 0xa8, 0x4b, 0x7d, 0xe2, 0x19, 0x66, 0xa7, 0xe3, 0x11, 0xdf, 0xcf, 0x2c, 0x08, + 0x7f, 0x81, 0x7c, 0x5d, 0x88, 0x0b, 0x19, 0x50, 0x37, 0x4d, 0x66, 0x6a, 0x69, 0x88, 0xb0, 0x43, + 0x3f, 0xa3, 0xe4, 0x23, 0xab, 0x49, 0x9d, 0x7f, 0x16, 0xfe, 0x9c, 0x05, 0x75, 0x8f, 0x32, 0xa2, + 0x7d, 0x0e, 0x2a, 0x6f, 0x13, 0xb2, 0x70, 0xe1, 0x3c, 0x6e, 0x37, 0xac, 0xae, 0x43, 0x3a, 0x3b, + 0x7e, 0xb7, 0x79, 0xe4, 0x12, 0x1d, 0x0d, 0x46, 0x68, 0x35, 0x3b, 0x46, 0xab, 0x65, 0x98, 0xf3, + 0xe8, 0xc0, 0xe9, 0x20, 0xdb, 0xe6, 0x74, 0xb1, 0xd0, 0xaa, 0x10, 0x0b, 0xd9, 0xa2, 0xbe, 0x0b, + 0x5b, 0x16, 0x39, 0x5b, 0x38, 0x9f, 0xa5, 0x40, 0x8f, 0xb6, 0x24, 0x69, 0xca, 0x10, 0x0f, 0x2f, + 0x38, 0xc9, 0xbc, 0x77, 0x23, 0xef, 0xd0, 0x4c, 0xfb, 0x04, 0x96, 0x42, 0x0e, 0x84, 0x45, 0x14, + 0xcc, 0x4b, 0x87, 0x0a, 0x59, 0xc5, 0x31, 0x7a, 0x19, 0xe2, 0x62, 0x8a, 0x62, 0x6e, 0x43, 0x7a, + 0x55, 0xf1, 0x86, 0xba, 0x0a, 0x71, 0xdf, 0xea, 0x3a, 0x26, 0x1b, 0x78, 0x44, 0x32, 0x70, 0x28, + 0x28, 0xbc, 0x54, 0x60, 0x5e, 0x30, 0x7a, 0xa4, 0x76, 0xca, 0xf4, 0xda, 0xcd, 0x9e, 0x57, 0xbb, + 0xc8, 0xfb, 0xd5, 0xae, 0x02, 0x10, 0x06, 0xe4, 0x67, 0xd4, 0x7c, 0x64, 0x35, 0xb1, 0xb6, 0x32, + 0xdd, 0x99, 0x08, 0xb5, 0x61, 0x75, 0xe5, 0xc1, 0x1d, 0x31, 0x2c, 0xfc, 0xae, 0x40, 0x3c, 0xd4, + 0x6b, 0x15, 0x48, 0x05, 0xf1, 0x19, 0xfb, 0xb6, 0xd9, 0x95, 0x5c, 0xba, 0xfe, 0xd6, 0x20, 0x1f, + 0xd8, 0x66, 0x57, 0x4f, 0xc8, 0xb8, 0xf8, 0x62, 0x7a, 0x4f, 0x66, 0xcf, 0xe9, 0xc9, 0x18, 0x09, + 0x22, 0xff, 0x8e, 0x04, 0x63, 0xed, 0x52, 0x27, 0xdb, 0xf5, 0xe3, 0x2c, 0xc4, 0xea, 0x78, 0x9e, + 0x4c, 0xfb, 0xbf, 0x3a, 0x25, 0x57, 0x20, 0xee, 0x52, 0xdb, 0x10, 0x1a, 0x15, 0x35, 0x31, 0x97, + 0xda, 0xfa, 0x19, 0x1a, 0xcc, 0x7d, 0xc0, 0x23, 0x34, 0xff, 0x01, 0xaa, 0x17, 0x9d, 0xac, 0xde, + 0x73, 0x48, 0x8a, 0x72, 0xc8, 0x79, 0x77, 0x97, 0xd7, 0x01, 0x87, 0xa8, 0x32, 0x7d, 0x4e, 0x8b, + 0xd0, 0x05, 0x5a, 0x97, 0x58, 0x6e, 0x25, 0x46, 0x83, 0x1c, 0xbd, 0x57, 0xdf, 0x46, 0x55, 0x5d, + 0x62, 0x0b, 0xdf, 0x2a, 0x00, 0xdb, 0xbc, 0xca, 0x98, 0x37, 0x9f, 0x56, 0x3e, 0x86, 0x62, 0x8c, + 0x45, 0x50, 0x78, 0x5b, 0x13, 0x65, 0x1c, 0x49, 0x7f, 0x34, 0x87, 0x2d, 0x48, 0x0d, 0x09, 0xea, + 0x93, 0x20, 0xa8, 0x73, 0x1c, 0x85, 0x83, 0xa4, 0x41, 0x98, 0x9e, 0x3c, 0x18, 0x59, 0x15, 0x7e, + 0x52, 0x20, 0x8e, 0xb1, 0xed, 0x10, 0x66, 0x8e, 0xf5, 0x55, 0x79, 0xbf, 0xbe, 0x5e, 0x03, 0x10, + 0xae, 0x7c, 0xeb, 0x39, 0x91, 0x8c, 0x8b, 0xa3, 0xa4, 0x61, 0x3d, 0x27, 0xda, 0xfd, 0xb0, 0x09, + 0x91, 0xbf, 0x6f, 0x82, 0x3c, 0xf6, 0x41, 0x2b, 0x2e, 0x41, 0xd4, 0x19, 0xf4, 0x0d, 0x3e, 0x46, + 0x54, 0xc1, 0x64, 0x67, 0xd0, 0x6f, 0x1e, 0xfa, 0x05, 0x07, 0xa2, 0xcd, 0x43, 0x7c, 0x5e, 0x71, + 0xfa, 0x7a, 0x94, 0xca, 0x39, 0x2e, 0xde, 0x52, 0x31, 0x2e, 0xc0, 0xb1, 0xa5, 0x81, 0xca, 0x07, + 0x76, 0xf0, 0xe0, 0xe3, 0xdf, 0xda, 0xda, 0x3f, 0x78, 0xbc, 0xc9, 0x67, 0xdb, 0xad, 0x9f, 0x15, + 0x48, 0x8c, 0xdc, 0x21, 0xda, 0x67, 0x70, 0xa1, 0xbc, 0xbd, 0xbb, 0xf1, 0xc8, 0xa8, 0x6e, 0x1a, + 0x0f, 0xb6, 0xd7, 0xb7, 0x8c, 0xc7, 0xb5, 0x47, 0xb5, 0xdd, 0xaf, 0x6a, 0xe9, 0x99, 0xec, 0xc5, + 0xe3, 0x93, 0xbc, 0x36, 0x82, 0x7d, 0xec, 0x3c, 0x75, 0xe8, 0x33, 0x47, 0x2b, 0xc1, 0xf2, 0xb8, + 0xc9, 0x7a, 0xb9, 0x51, 0xa9, 0x35, 0xd3, 0x4a, 0xf6, 0xc2, 0xf1, 0x49, 0x7e, 0x69, 0xc4, 0x62, + 0xbd, 0xe5, 0x13, 0x87, 0x9d, 0x35, 0xd8, 0xd8, 0xdd, 0xd9, 0xa9, 0x36, 0xd3, 0xb3, 0x67, 0x0c, + 0xe4, 0x05, 0x7f, 0x13, 0x96, 0xc6, 0x0d, 0x6a, 0xd5, 0xed, 0x74, 0x24, 0xab, 0x1d, 0x9f, 0xe4, + 0x17, 0x46, 0xd0, 0x35, 0xcb, 0xce, 0xc6, 0xbe, 0xf9, 0x2e, 0x37, 0xf3, 0xc3, 0xf7, 0x39, 0x85, + 0x67, 0x96, 0x1a, 0xbb, 0x43, 0xb4, 0x4f, 0xe1, 0x52, 0xa3, 0xba, 0x55, 0xab, 0x6c, 0x1a, 0x3b, + 0x8d, 0x2d, 0xa3, 0xf9, 0xa4, 0x5e, 0x19, 0xc9, 0x6e, 0xf1, 0xf8, 0x24, 0x9f, 0x90, 0x29, 0x9d, + 0x87, 0xae, 0xeb, 0x95, 0xbd, 0xdd, 0x66, 0x25, 0xad, 0x08, 0x74, 0xdd, 0x23, 0x07, 0x94, 0x11, + 0x44, 0xdf, 0x86, 0xcb, 0x53, 0xd0, 0x61, 0x62, 0x4b, 0xc7, 0x27, 0xf9, 0x54, 0xdd, 0x23, 0xe2, + 0x4c, 0xa1, 0x45, 0x11, 0x32, 0x67, 0x2d, 0x76, 0xeb, 0xbb, 0x8d, 0xf5, 0xed, 0x74, 0x3e, 0x9b, + 0x3e, 0x3e, 0xc9, 0x27, 0x83, 0x0b, 0x93, 0xe3, 0x87, 0x99, 0x95, 0x9b, 0x2f, 0x4f, 0x73, 0xca, + 0xab, 0xd3, 0x9c, 0xf2, 0xdb, 0x69, 0x4e, 0x79, 0xf1, 0x26, 0x37, 0xf3, 0xea, 0x4d, 0x6e, 0xe6, + 0x97, 0x37, 0xb9, 0x99, 0xaf, 0xef, 0x77, 0x2d, 0xd6, 0x1b, 0xb4, 0x78, 0xe3, 0x4b, 0x8f, 0x9e, + 0xec, 0x55, 0x6a, 0x84, 0x3d, 0xa3, 0xde, 0xd3, 0xd2, 0xc4, 0x5f, 0x0d, 0xf1, 0x9f, 0x27, 0x14, + 0x22, 0x4f, 0x5b, 0xf3, 0x28, 0xbd, 0xf3, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xcc, 0x8f, + 0x00, 0x4e, 0x0d, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/types.proto b/proto/cometbft/v034x/types/types.proto similarity index 91% rename from proto/tendermint/types/types.proto rename to proto/cometbft/v034x/types/types.proto index 3ce1694594f..d608eb41369 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/cometbft/v034x/types/types.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v034x.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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/v034x/crypto/proof.proto"; +import "cometbft/v034x/version/types.proto"; +import "cometbft/v034x/types/validator.proto"; // BlockIdFlag indicates which BlcokID the signature is for enum BlockIDFlag { @@ -43,7 +43,7 @@ message PartSetHeader { message Part { uint32 index = 1; bytes bytes = 2; - tendermint.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; + cometbft.v034x.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; } // BlockID @@ -57,7 +57,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.v034x.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]; @@ -139,7 +139,7 @@ message SignedHeader { message LightBlock { SignedHeader signed_header = 1; - tendermint.types.ValidatorSet validator_set = 2; + cometbft.v034x.types.ValidatorSet validator_set = 2; } message BlockMeta { @@ -153,5 +153,5 @@ message BlockMeta { message TxProof { bytes root_hash = 1; bytes data = 2; - tendermint.crypto.Proof proof = 3; + cometbft.v034x.crypto.Proof proof = 3; } diff --git a/proto/tendermint/types/validator.pb.go b/proto/cometbft/v034x/types/validator.pb.go similarity index 87% rename from proto/tendermint/types/validator.pb.go rename to proto/cometbft/v034x/types/validator.pb.go index 23b30ed3cb5..d626b98f9db 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/cometbft/v034x/types/validator.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/validator.proto +// source: cometbft/v034x/types/validator.proto package types import ( fmt "fmt" + crypto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/crypto" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,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_160a1405163da8f5, []int{0} } func (m *ValidatorSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,7 +95,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_160a1405163da8f5, []int{1} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -161,7 +161,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_160a1405163da8f5, []int{2} } func (m *SimpleValidator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,38 +205,42 @@ func (m *SimpleValidator) GetVotingPower() int64 { } func init() { - 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{ - // 361 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcf, 0x4e, 0xc2, 0x40, - 0x10, 0xc6, 0xbb, 0x40, 0x40, 0x17, 0x12, 0x71, 0xe3, 0xa1, 0x41, 0x52, 0x2b, 0x27, 0x12, 0x4d, - 0x9b, 0x68, 0x0c, 0x07, 0x6e, 0x5c, 0xb9, 0x60, 0x49, 0x38, 0x78, 0x69, 0x5a, 0xba, 0xa9, 0x1b, - 0x0a, 0xbb, 0xd9, 0x6e, 0x31, 0xfb, 0x16, 0x3e, 0x8b, 0x4f, 0xc1, 0x91, 0xa3, 0x27, 0x63, 0xe0, - 0x45, 0x4c, 0x5b, 0xfa, 0x27, 0xa8, 0xe1, 0x36, 0x9d, 0xef, 0x9b, 0x99, 0x5f, 0x37, 0x1f, 0xd4, - 0x05, 0x5e, 0x79, 0x98, 0x2f, 0xc9, 0x4a, 0x98, 0x42, 0x32, 0x1c, 0x9a, 0x6b, 0x27, 0x20, 0x9e, - 0x23, 0x28, 0x37, 0x18, 0xa7, 0x82, 0xa2, 0x76, 0xe1, 0x30, 0x12, 0x47, 0xe7, 0xca, 0xa7, 0x3e, - 0x4d, 0x44, 0x33, 0xae, 0x52, 0x5f, 0xa7, 0x5b, 0xda, 0x34, 0xe7, 0x92, 0x09, 0x6a, 0x2e, 0xb0, - 0x0c, 0x53, 0xb5, 0xf7, 0x01, 0x60, 0x6b, 0x96, 0x6d, 0x9e, 0x62, 0x81, 0x86, 0x10, 0xe6, 0x97, - 0x42, 0x15, 0xe8, 0xd5, 0x7e, 0xf3, 0xe1, 0xda, 0x38, 0xbe, 0x65, 0xe4, 0x33, 0x56, 0xc9, 0x8e, - 0x06, 0xf0, 0x8c, 0x71, 0xca, 0x68, 0x88, 0xb9, 0x5a, 0xd1, 0xc1, 0xa9, 0xd1, 0xdc, 0x8c, 0xee, - 0x21, 0x12, 0x54, 0x38, 0x81, 0xbd, 0xa6, 0x82, 0xac, 0x7c, 0x9b, 0xd1, 0x37, 0xcc, 0xd5, 0xaa, - 0x0e, 0xfa, 0x55, 0xab, 0x9d, 0x28, 0xb3, 0x44, 0x98, 0xc4, 0xfd, 0x18, 0xfa, 0x3c, 0xdf, 0x82, - 0x54, 0xd8, 0x70, 0x3c, 0x8f, 0xe3, 0x30, 0xc6, 0x05, 0xfd, 0x96, 0x95, 0x7d, 0xa2, 0x21, 0x6c, - 0xb0, 0xc8, 0xb5, 0x17, 0x58, 0x1e, 0x68, 0xba, 0x65, 0x9a, 0xf4, 0x31, 0x8c, 0x49, 0xe4, 0x06, - 0x64, 0x3e, 0xc6, 0x72, 0x54, 0xdb, 0x7c, 0xdd, 0x28, 0x56, 0x9d, 0x45, 0xee, 0x18, 0x4b, 0x74, - 0x0b, 0x5b, 0x7f, 0xc0, 0x34, 0xd7, 0x05, 0x07, 0xba, 0x83, 0x97, 0xd9, 0x1f, 0xd8, 0x8c, 0x13, - 0xca, 0x89, 0x90, 0x6a, 0x2d, 0x85, 0xce, 0x84, 0xc9, 0xa1, 0xdf, 0x5b, 0xc0, 0x8b, 0x29, 0x59, - 0xb2, 0x00, 0x17, 0xe4, 0x4f, 0x05, 0x1f, 0x38, 0xcd, 0xf7, 0x2f, 0x59, 0xe5, 0x17, 0xd9, 0xe8, - 0x79, 0xb3, 0xd3, 0xc0, 0x76, 0xa7, 0x81, 0xef, 0x9d, 0x06, 0xde, 0xf7, 0x9a, 0xb2, 0xdd, 0x6b, - 0xca, 0xe7, 0x5e, 0x53, 0x5e, 0x06, 0x3e, 0x11, 0xaf, 0x91, 0x6b, 0xcc, 0xe9, 0xd2, 0x2c, 0x67, - 0xac, 0x28, 0xd3, 0x04, 0x1d, 0xe7, 0xcf, 0xad, 0x27, 0xfd, 0xc7, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x48, 0xbf, 0x34, 0x35, 0x9a, 0x02, 0x00, 0x00, + proto.RegisterType((*ValidatorSet)(nil), "cometbft.v034x.types.ValidatorSet") + proto.RegisterType((*Validator)(nil), "cometbft.v034x.types.Validator") + proto.RegisterType((*SimpleValidator)(nil), "cometbft.v034x.types.SimpleValidator") +} + +func init() { + proto.RegisterFile("cometbft/v034x/types/validator.proto", fileDescriptor_160a1405163da8f5) +} + +var fileDescriptor_160a1405163da8f5 = []byte{ + // 385 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6a, 0xe2, 0x40, + 0x1c, 0xc6, 0x33, 0x2a, 0xba, 0x3b, 0x0a, 0xbb, 0x3b, 0x78, 0x08, 0x1e, 0x62, 0x56, 0xf6, 0x20, + 0x6c, 0x49, 0x4a, 0xed, 0xa5, 0xed, 0x41, 0x10, 0x7a, 0x12, 0x8a, 0xc4, 0x22, 0xb4, 0x97, 0x90, + 0xe8, 0x34, 0x0d, 0xc6, 0xfe, 0x87, 0xc9, 0x24, 0x36, 0x6f, 0xd1, 0xa7, 0xe9, 0xa1, 0x4f, 0xe0, + 0xd1, 0x63, 0x4f, 0xa5, 0xe8, 0x8b, 0x94, 0x24, 0x26, 0x16, 0x6b, 0xc1, 0x5b, 0xf2, 0xfd, 0xbf, + 0x6f, 0xbe, 0x5f, 0x32, 0x7f, 0xfc, 0x6f, 0x0c, 0x33, 0x2a, 0xec, 0x3b, 0xa1, 0x87, 0xc7, 0x9d, + 0xd3, 0x47, 0x5d, 0x44, 0x8c, 0xfa, 0x7a, 0x68, 0x79, 0xee, 0xc4, 0x12, 0xc0, 0x35, 0xc6, 0x41, + 0x00, 0xa9, 0x67, 0x2e, 0x2d, 0x71, 0x69, 0x89, 0xab, 0x51, 0x77, 0xc0, 0x81, 0xc4, 0xa0, 0xc7, + 0x4f, 0xa9, 0xb7, 0xa1, 0xee, 0x9c, 0x38, 0xe6, 0x11, 0x13, 0xa0, 0x4f, 0x69, 0xe4, 0xa7, 0x8e, + 0xd6, 0x0b, 0xc2, 0xb5, 0x51, 0xd6, 0x30, 0xa4, 0x82, 0x74, 0x31, 0xce, 0x1b, 0x7d, 0x19, 0xa9, + 0xc5, 0x76, 0xf5, 0xa4, 0xa9, 0xed, 0xeb, 0xd4, 0xf2, 0x9c, 0xf1, 0x29, 0x42, 0x2e, 0xf0, 0x0f, + 0xc6, 0x81, 0x81, 0x4f, 0xb9, 0x5c, 0x50, 0xd1, 0x21, 0xf1, 0x3c, 0x40, 0x8e, 0x30, 0x11, 0x20, + 0x2c, 0xcf, 0x0c, 0x41, 0xb8, 0x0f, 0x8e, 0xc9, 0x60, 0x4e, 0xb9, 0x5c, 0x54, 0x51, 0xbb, 0x68, + 0xfc, 0x4e, 0x26, 0xa3, 0x64, 0x30, 0x88, 0xf5, 0xd6, 0x33, 0xc2, 0x3f, 0xf3, 0x53, 0x88, 0x8c, + 0x2b, 0xd6, 0x64, 0xc2, 0xa9, 0x1f, 0x63, 0xa3, 0x76, 0xcd, 0xc8, 0x5e, 0x49, 0x17, 0x57, 0x58, + 0x60, 0x9b, 0x53, 0x1a, 0x6d, 0x88, 0xd4, 0x5d, 0xa2, 0xf4, 0xc7, 0x68, 0x83, 0xc0, 0xf6, 0xdc, + 0x71, 0x9f, 0x46, 0xbd, 0xd2, 0xe2, 0xad, 0x29, 0x19, 0x65, 0x16, 0xd8, 0x7d, 0x1a, 0x91, 0xbf, + 0xb8, 0xb6, 0x07, 0xa8, 0x1a, 0x6e, 0x59, 0xc8, 0x7f, 0xfc, 0x27, 0xfb, 0x0a, 0x93, 0x71, 0x17, + 0xb8, 0x2b, 0x22, 0xb9, 0x94, 0x82, 0x67, 0x83, 0xc1, 0x46, 0x6f, 0x01, 0xfe, 0x35, 0x74, 0x67, + 0xcc, 0xa3, 0x5b, 0xfa, 0xb3, 0x2d, 0x23, 0x3a, 0x8c, 0xf1, 0x5b, 0xba, 0xc2, 0x17, 0xba, 0xde, + 0xf5, 0x62, 0xa5, 0xa0, 0xe5, 0x4a, 0x41, 0xef, 0x2b, 0x05, 0x3d, 0xad, 0x15, 0x69, 0xb9, 0x56, + 0xa4, 0xd7, 0xb5, 0x22, 0xdd, 0x9e, 0x3b, 0xae, 0xb8, 0x0f, 0xec, 0xb8, 0x4c, 0xef, 0xdf, 0x8c, + 0x2e, 0xaf, 0xa8, 0x98, 0x03, 0x9f, 0xea, 0x3b, 0x9b, 0x93, 0xae, 0x56, 0x2e, 0x26, 0x37, 0x68, + 0x97, 0x13, 0xb5, 0xf3, 0x11, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x7d, 0x6a, 0x63, 0xb9, 0x02, 0x00, + 0x00, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/validator.proto b/proto/cometbft/v034x/types/validator.proto similarity index 61% rename from proto/tendermint/types/validator.proto rename to proto/cometbft/v034x/types/validator.proto index 49860b96d6b..a1641bf2580 100644 --- a/proto/tendermint/types/validator.proto +++ b/proto/cometbft/v034x/types/validator.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v034x.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types"; import "gogoproto/gogo.proto"; -import "tendermint/crypto/keys.proto"; +import "cometbft/v034x/crypto/keys.proto"; message ValidatorSet { repeated Validator validators = 1; @@ -14,12 +14,12 @@ message ValidatorSet { message Validator { bytes address = 1; - tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; + cometbft.v034x.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.v034x.crypto.PublicKey pub_key = 1; int64 voting_power = 2; } diff --git a/proto/tendermint/version/types.pb.go b/proto/cometbft/v034x/version/types.pb.go similarity index 86% rename from proto/tendermint/version/types.pb.go rename to proto/cometbft/v034x/version/types.pb.go index 415869b0382..56bbe709838 100644 --- a/proto/tendermint/version/types.pb.go +++ b/proto/cometbft/v034x/version/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/version/types.proto +// source: cometbft/v034x/version/types.proto package version @@ -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_6ea3bcb2a591fc37, []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_6ea3bcb2a591fc37, []int{1} } func (m *Consensus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -134,28 +134,31 @@ 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.v034x.version.App") + proto.RegisterType((*Consensus)(nil), "cometbft.v034x.version.Consensus") } -func init() { proto.RegisterFile("tendermint/version/types.proto", fileDescriptor_f9b42966edc5edad) } +func init() { + proto.RegisterFile("cometbft/v034x/version/types.proto", fileDescriptor_6ea3bcb2a591fc37) +} -var fileDescriptor_f9b42966edc5edad = []byte{ - // 218 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, 0x53, 0xf0, 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, 0x59, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x23, 0x79, - 0x14, 0x89, 0x09, 0xf1, 0x06, 0x66, 0x20, 0x24, 0xb1, 0x81, 0x65, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x42, 0x43, 0x65, 0xc7, 0x21, 0x01, 0x00, 0x00, +var fileDescriptor_6ea3bcb2a591fc37 = []byte{ + // 237 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, 0x30, 0x36, 0xa9, 0xd0, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, + 0xcc, 0xcf, 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x83, 0xa9, 0xd1, 0x03, 0xab, 0xd1, 0x83, 0xaa, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, + 0xd1, 0x07, 0xb1, 0x20, 0xaa, 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, 0xcd, 0xf3, 0x10, 0xbf, 0x20, 0x04, 0x21, 0xfe, 0x4c, 0x62, 0x03, 0x8b, 0x1b, 0x03, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xef, 0x1c, 0x17, 0x6c, 0x2c, 0x01, 0x00, 0x00, } func (this *Consensus) Equal(that interface{}) bool { diff --git a/proto/tendermint/version/types.proto b/proto/cometbft/v034x/version/types.proto similarity index 82% rename from proto/tendermint/version/types.proto rename to proto/cometbft/v034x/version/types.proto index 6061868bd43..c825f5005ae 100644 --- a/proto/tendermint/version/types.proto +++ b/proto/cometbft/v034x/version/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.version; +package cometbft.v034x.version; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/version"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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 3111d113a5b..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/tendermint/tendermint/proto/tendermint/libs/bits"; - -message BitArray { - int64 bits = 1; - repeated uint64 elems = 2; -} diff --git a/proto/tendermint/mempool/types.proto b/proto/tendermint/mempool/types.proto deleted file mode 100644 index b55d9717b1b..00000000000 --- a/proto/tendermint/mempool/types.proto +++ /dev/null @@ -1,14 +0,0 @@ -syntax = "proto3"; -package tendermint.mempool; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/mempool"; - -message Txs { - repeated bytes txs = 1; -} - -message Message { - oneof sum { - Txs txs = 1; - } -} diff --git a/proto/tendermint/store/types.proto b/proto/tendermint/store/types.proto deleted file mode 100644 index af2f97ad08c..00000000000 --- a/proto/tendermint/store/types.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; -package tendermint.store; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/store"; - -message BlockStoreState { - int64 base = 1; - int64 height = 2; -} diff --git a/proto/tendermint/types/block.proto b/proto/tendermint/types/block.proto deleted file mode 100644 index 84e9bb15d86..00000000000 --- a/proto/tendermint/types/block.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; -package tendermint.types; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; - -import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; -import "tendermint/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]; - Commit last_commit = 4; -} diff --git a/proto/tendermint/types/events.proto b/proto/tendermint/types/events.proto deleted file mode 100644 index a1e5cc498d2..00000000000 --- a/proto/tendermint/types/events.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package tendermint.types; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; - -message EventDataRoundState { - int64 height = 1; - int32 round = 2; - string step = 3; -} diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 690c08df9f7..85e79959ef6 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -1,8 +1,8 @@ package proxy import ( - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/types" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/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 2b566404706..0a54ddda255 100644 --- a/proxy/app_conn_test.go +++ b/proxy/app_conn_test.go @@ -5,12 +5,12 @@ import ( "strings" "testing" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/abci/server" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) //---------------------------------------- diff --git a/proxy/client.go b/proxy/client.go index fa6095a8417..aec528b3a69 100644 --- a/proxy/client.go +++ b/proxy/client.go @@ -3,12 +3,12 @@ package proxy import ( "fmt" - abcicli "github.com/tendermint/tendermint/abci/client" - "github.com/tendermint/tendermint/abci/example/counter" - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/abci/types" - cmtsync "github.com/tendermint/tendermint/libs/sync" - e2e "github.com/tendermint/tendermint/test/e2e/app" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + "github.com/KYVENetwork/cometbft/v034x/abci/example/counter" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + e2e "github.com/KYVENetwork/cometbft/v034x/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 d70cd7cc1eb..5df5e9c8959 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -4,9 +4,9 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - abcicli "github.com/tendermint/tendermint/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 05e23dd4337..9e01719fa22 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -4,9 +4,9 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - abcicli "github.com/tendermint/tendermint/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 544ab765ef7..f799a7d7db1 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 e3d5cb6cdaa..22d85f7f92f 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 eced0aeff60..65f0074241f 100644 --- a/proxy/mocks/client_creator.go +++ b/proxy/mocks/client_creator.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - abcicli "github.com/tendermint/tendermint/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" ) // ClientCreator is an autogenerated mock type for the ClientCreator type diff --git a/proxy/multi_app_conn.go b/proxy/multi_app_conn.go index 830a581dc6f..e8eac82df3c 100644 --- a/proxy/multi_app_conn.go +++ b/proxy/multi_app_conn.go @@ -3,10 +3,10 @@ package proxy import ( "fmt" - abcicli "github.com/tendermint/tendermint/abci/client" - cmtlog "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/service" + abcicli "github.com/KYVENetwork/cometbft/v034x/abci/client" + cmtlog "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) const ( diff --git a/proxy/multi_app_conn_test.go b/proxy/multi_app_conn_test.go index 6ad7e6df117..63fde24d0f4 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/tendermint/tendermint/abci/client/mocks" - "github.com/tendermint/tendermint/proxy/mocks" + abcimocks "github.com/KYVENetwork/cometbft/v034x/abci/client/mocks" + "github.com/KYVENetwork/cometbft/v034x/proxy/mocks" ) func TestAppConns_Start_Stop(t *testing.T) { diff --git a/proxy/version.go b/proxy/version.go index be890e12e03..ba1112ca4f7 100644 --- a/proxy/version.go +++ b/proxy/version.go @@ -1,8 +1,8 @@ package proxy import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/version" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) // RequestInfo contains all the information for sending diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index d1d0b7a7de7..e3294aa08be 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/tendermint/tendermint/abci/types" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) var waitForEventTimeout = 8 * time.Second diff --git a/rpc/client/evidence_test.go b/rpc/client/evidence_test.go index ee7418fa7c5..1ebc038eff4 100644 --- a/rpc/client/evidence_test.go +++ b/rpc/client/evidence_test.go @@ -9,16 +9,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/privval" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/rpc/client" - rpctest "github.com/tendermint/tendermint/rpc/test" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/privval" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/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 b769294d59a..eb54fb5fbb3 100644 --- a/rpc/client/examples_test.go +++ b/rpc/client/examples_test.go @@ -6,10 +6,10 @@ import ( "fmt" "log" - "github.com/tendermint/tendermint/abci/example/kvstore" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctest "github.com/tendermint/tendermint/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" ) func ExampleHTTP_simple() { diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go index 0878df6a802..6d19b50c3c2 100644 --- a/rpc/client/helpers.go +++ b/rpc/client/helpers.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/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 3b78dfe5f63..056807a5f0a 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/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + "github.com/KYVENetwork/cometbft/v034x/rpc/client/mock" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" ) func TestWaitForHeight(t *testing.T) { diff --git a/rpc/client/http/http.go b/rpc/client/http/http.go index dc3b0551b2c..f65e7791126 100644 --- a/rpc/client/http/http.go +++ b/rpc/client/http/http.go @@ -7,16 +7,16 @@ import ( "strings" "time" - "github.com/tendermint/tendermint/libs/bytes" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - rpcclient "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - jsonrpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + jsonrpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/client" + "github.com/KYVENetwork/cometbft/v034x/types" ) /* diff --git a/rpc/client/interface.go b/rpc/client/interface.go index 9c049e65052..9bf40538f60 100644 --- a/rpc/client/interface.go +++ b/rpc/client/interface.go @@ -23,10 +23,10 @@ implementation. import ( "context" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/service" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/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 126a1267d24..69320076c4f 100644 --- a/rpc/client/local/local.go +++ b/rpc/client/local/local.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" - nm "github.com/tendermint/tendermint/node" - rpcclient "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + nm "github.com/KYVENetwork/cometbft/v034x/node" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/client" + "github.com/KYVENetwork/cometbft/v034x/rpc/core" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) /* diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go index b5bfbd71899..08cfcc010fc 100644 --- a/rpc/client/main_test.go +++ b/rpc/client/main_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/tendermint/tendermint/abci/example/kvstore" - nm "github.com/tendermint/tendermint/node" - rpctest "github.com/tendermint/tendermint/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + nm "github.com/KYVENetwork/cometbft/v034x/node" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" ) var node *nm.Node diff --git a/rpc/client/mock/abci.go b/rpc/client/mock/abci.go index 598fd80754c..043e8f6f071 100644 --- a/rpc/client/mock/abci.go +++ b/rpc/client/mock/abci.go @@ -3,12 +3,12 @@ package mock import ( "context" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // ABCIApp will send all abci related request to the named app, diff --git a/rpc/client/mock/abci_test.go b/rpc/client/mock/abci_test.go index d164b275a8b..847bd8f6e6f 100644 --- a/rpc/client/mock/abci_test.go +++ b/rpc/client/mock/abci_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/abci/example/kvstore" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + "github.com/KYVENetwork/cometbft/v034x/rpc/client/mock" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestABCIMock(t *testing.T) { diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go index ec31e0d9fa5..499a59969b3 100644 --- a/rpc/client/mock/client.go +++ b/rpc/client/mock/client.go @@ -18,13 +18,13 @@ import ( "context" "reflect" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/rpc/client" - "github.com/tendermint/tendermint/rpc/core" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + "github.com/KYVENetwork/cometbft/v034x/rpc/core" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Client wraps arbitrary implementations of the various interfaces. diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go index 6dd6a8d4463..908110ce7fe 100644 --- a/rpc/client/mock/status.go +++ b/rpc/client/mock/status.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/tendermint/tendermint/rpc/client" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v034x/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 4c2112b9c0e..a0b65dee017 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/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/rpc/client/mock" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" ) func TestStatus(t *testing.T) { diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go index f8eb7a45ce8..7d27042d9bd 100644 --- a/rpc/client/mocks/client.go +++ b/rpc/client/mocks/client.go @@ -3,18 +3,18 @@ package mocks import ( - bytes "github.com/tendermint/tendermint/libs/bytes" - client "github.com/tendermint/tendermint/rpc/client" + bytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + client "github.com/KYVENetwork/cometbft/v034x/rpc/client" context "context" - coretypes "github.com/tendermint/tendermint/rpc/core/types" + coretypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" - log "github.com/tendermint/tendermint/libs/log" + log "github.com/KYVENetwork/cometbft/v034x/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/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 0b7d93d699e..a9967229a13 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/tendermint/tendermint/abci/types" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/rpc/client" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpclocal "github.com/tendermint/tendermint/rpc/client/local" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" - rpctest "github.com/tendermint/tendermint/rpc/test" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + rpclocal "github.com/KYVENetwork/cometbft/v034x/rpc/client/local" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/client" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/types" ) var ( diff --git a/rpc/core/abci.go b/rpc/core/abci.go index ec0e6723485..2da5dff85f2 100644 --- a/rpc/core/abci.go +++ b/rpc/core/abci.go @@ -1,11 +1,11 @@ package core import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/proxy" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/proxy" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) // ABCIQuery queries the application for some information. diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index 05b5572b6f1..da5f0f15e68 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -5,12 +5,12 @@ import ( "fmt" "sort" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - blockidxnull "github.com/tendermint/tendermint/state/indexer/block/null" - "github.com/tendermint/tendermint/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + blockidxnull "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/null" + "github.com/KYVENetwork/cometbft/v034x/types" ) // BlockchainInfo gets block headers for minHeight <= height <= maxHeight. diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go index 8ed76cde1dc..ef8955b79fe 100644 --- a/rpc/core/blocks_test.go +++ b/rpc/core/blocks_test.go @@ -9,12 +9,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestBlockchainInfo(t *testing.T) { diff --git a/rpc/core/consensus.go b/rpc/core/consensus.go index 936a39b7e6d..0583ba54300 100644 --- a/rpc/core/consensus.go +++ b/rpc/core/consensus.go @@ -1,11 +1,11 @@ package core import ( - cm "github.com/tendermint/tendermint/consensus" - cmtmath "github.com/tendermint/tendermint/libs/math" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + cm "github.com/KYVENetwork/cometbft/v034x/consensus" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Validators gets the validator set at the given block height. diff --git a/rpc/core/dev.go b/rpc/core/dev.go index b70f5f1e12d..05a340e6eab 100644 --- a/rpc/core/dev.go +++ b/rpc/core/dev.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) // UnsafeFlushMempool removes all transactions from the mempool. diff --git a/rpc/core/env.go b/rpc/core/env.go index 145f62254ee..d09f5010ea0 100644 --- a/rpc/core/env.go +++ b/rpc/core/env.go @@ -5,18 +5,18 @@ import ( "fmt" "time" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/crypto" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/rpc/core/events.go b/rpc/core/events.go index e91021ee6d7..4393b30de41 100644 --- a/rpc/core/events.go +++ b/rpc/core/events.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) const ( diff --git a/rpc/core/evidence.go b/rpc/core/evidence.go index bbfc1cbb572..9f558b89375 100644 --- a/rpc/core/evidence.go +++ b/rpc/core/evidence.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // BroadcastEvidence broadcasts evidence of the misbehavior. diff --git a/rpc/core/health.go b/rpc/core/health.go index ef82ba0c3d9..d68b54b3234 100644 --- a/rpc/core/health.go +++ b/rpc/core/health.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/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 1eea1e8e24d..e82a945e055 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" - mempl "github.com/tendermint/tendermint/mempool" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/net.go b/rpc/core/net.go index c42016ec7aa..5b02e9babbf 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/p2p" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) // NetInfo returns network info. diff --git a/rpc/core/net_test.go b/rpc/core/net_test.go index c971776f3e8..650c840f4c6 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/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) func TestUnsafeDialSeeds(t *testing.T) { diff --git a/rpc/core/routes.go b/rpc/core/routes.go index 65fe7365aff..e2228518343 100644 --- a/rpc/core/routes.go +++ b/rpc/core/routes.go @@ -1,7 +1,7 @@ package core import ( - rpc "github.com/tendermint/tendermint/rpc/jsonrpc/server" + rpc "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" ) // TODO: better system than "unsafe" prefix diff --git a/rpc/core/status.go b/rpc/core/status.go index 605d3107df7..386846a0f82 100644 --- a/rpc/core/status.go +++ b/rpc/core/status.go @@ -3,11 +3,11 @@ package core import ( "time" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/p2p" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/types" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/p2p" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Status returns CometBFT status including node info, pubkey, latest block diff --git a/rpc/core/tx.go b/rpc/core/tx.go index fe24f5c17bc..acce84605b0 100644 --- a/rpc/core/tx.go +++ b/rpc/core/tx.go @@ -5,12 +5,12 @@ import ( "fmt" "sort" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" - "github.com/tendermint/tendermint/state/txindex/null" - "github.com/tendermint/tendermint/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/null" + "github.com/KYVENetwork/cometbft/v034x/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 c6ed6eb1999..022295b8a6d 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/p2p" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // List of blocks diff --git a/rpc/core/types/responses_test.go b/rpc/core/types/responses_test.go index d6a59e96b8b..9f74a46405f 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/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) func TestStatusIndexer(t *testing.T) { diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go index 62c6b66c172..ebfd30a43cb 100644 --- a/rpc/grpc/api.go +++ b/rpc/grpc/api.go @@ -3,9 +3,9 @@ package coregrpc import ( "context" - abci "github.com/tendermint/tendermint/abci/types" - core "github.com/tendermint/tendermint/rpc/core" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + core "github.com/KYVENetwork/cometbft/v034x/rpc/core" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) type broadcastAPI struct { diff --git a/rpc/grpc/client_server.go b/rpc/grpc/client_server.go index 39c6859c13d..f67eaf02374 100644 --- a/rpc/grpc/client_server.go +++ b/rpc/grpc/client_server.go @@ -6,7 +6,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - cmtnet "github.com/tendermint/tendermint/libs/net" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" ) // Config is an gRPC server configuration. diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go index 073ff51c99e..e8239c8ecba 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/tendermint/tendermint/abci/example/kvstore" - core_grpc "github.com/tendermint/tendermint/rpc/grpc" - rpctest "github.com/tendermint/tendermint/rpc/test" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + core_grpc "github.com/KYVENetwork/cometbft/v034x/rpc/grpc" + rpctest "github.com/KYVENetwork/cometbft/v034x/rpc/test" ) func TestMain(m *testing.M) { diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index b9cbee03fc8..7d1cd5d87d2 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/rpc/grpc/types.proto +// source: cometbft/rpc/grpc/types.proto package coregrpc @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/gogo/protobuf/proto" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/abci/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -196,13 +196,13 @@ func (m *ResponseBroadcastTx) GetDeliverTx() *types.ResponseDeliverTx { } 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") + proto.RegisterType((*RequestPing)(nil), "cometbft.rpc.grpc.RequestPing") + proto.RegisterType((*RequestBroadcastTx)(nil), "cometbft.rpc.grpc.RequestBroadcastTx") + proto.RegisterType((*ResponsePing)(nil), "cometbft.rpc.grpc.ResponsePing") + proto.RegisterType((*ResponseBroadcastTx)(nil), "cometbft.rpc.grpc.ResponseBroadcastTx") } -func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } +func init() { proto.RegisterFile("cometbft/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } var fileDescriptor_0ffff5682c662b95 = []byte{ // 316 bytes of a gzipped FileDescriptorProto @@ -254,7 +254,7 @@ func NewBroadcastAPIClient(cc *grpc.ClientConn) BroadcastAPIClient { 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.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) if err != nil { return nil, err } @@ -263,7 +263,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.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) if err != nil { return nil, err } @@ -301,7 +301,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.rpc.grpc.BroadcastAPI/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).Ping(ctx, req.(*RequestPing)) @@ -319,7 +319,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", + FullMethod: "/cometbft.rpc.grpc.BroadcastAPI/BroadcastTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).BroadcastTx(ctx, req.(*RequestBroadcastTx)) @@ -328,7 +328,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.rpc.grpc.BroadcastAPI", + ServiceName: "cometbft.rpc.grpc.BroadcastAPI", HandlerType: (*BroadcastAPIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -341,7 +341,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/rpc/grpc/types.proto", + Metadata: "cometbft/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 d351791d1b2..d43818159e9 100644 --- a/rpc/jsonrpc/client/decode.go +++ b/rpc/jsonrpc/client/decode.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - cmtjson "github.com/tendermint/tendermint/libs/json" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) func unmarshalResponseBytes( diff --git a/rpc/jsonrpc/client/encode.go b/rpc/jsonrpc/client/encode.go index c8ea4952ea4..232636cc36c 100644 --- a/rpc/jsonrpc/client/encode.go +++ b/rpc/jsonrpc/client/encode.go @@ -5,7 +5,7 @@ import ( "net/url" "reflect" - cmtjson "github.com/tendermint/tendermint/libs/json" + cmtjson "github.com/KYVENetwork/cometbft/v034x/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 76fa5063f96..129e10a3dd2 100644 --- a/rpc/jsonrpc/client/http_json_client.go +++ b/rpc/jsonrpc/client/http_json_client.go @@ -11,8 +11,8 @@ import ( "net/url" "strings" - cmtsync "github.com/tendermint/tendermint/libs/sync" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/http_uri_client.go b/rpc/jsonrpc/client/http_uri_client.go index e5d5a5c587f..899ffcefe96 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/tendermint/tendermint/rpc/jsonrpc/types" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/integration_test.go b/rpc/jsonrpc/client/integration_test.go index 26f24d2555a..395ffeaad88 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/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) func TestWSClientReconnectWithJitter(t *testing.T) { diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go index 69a1489e058..849066dec8a 100644 --- a/rpc/jsonrpc/client/ws_client.go +++ b/rpc/jsonrpc/client/ws_client.go @@ -12,11 +12,11 @@ import ( "github.com/gorilla/websocket" metrics "github.com/rcrowley/go-metrics" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/libs/service" - cmtsync "github.com/tendermint/tendermint/libs/sync" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) const ( @@ -501,7 +501,7 @@ func (c *WSClient) readRoutine() { // because they are implemented as responses with the subscribe request's // ID. According to the spec, they should be notifications (requests // without IDs). - // https://github.com/tendermint/tendermint/issues/2949 + // https://github.com/KYVENetwork/cometbft/v034x/issues/2949 // c.mtx.Lock() // if _, ok := c.sentIDs[response.ID.(types.JSONRPCIntID)]; !ok { // c.Logger.Error("unsolicited response ID", "id", response.ID, "expected", c.sentIDs) diff --git a/rpc/jsonrpc/client/ws_client_test.go b/rpc/jsonrpc/client/ws_client_test.go index c32228b8f77..3d842b56d19 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/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) var wsCallTimeout = 5 * time.Second diff --git a/rpc/jsonrpc/jsonrpc_test.go b/rpc/jsonrpc/jsonrpc_test.go index 0f778531b2a..b27cec2cb67 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/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" - client "github.com/tendermint/tendermint/rpc/jsonrpc/client" - server "github.com/tendermint/tendermint/rpc/jsonrpc/server" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + client "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/client" + server "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + types "github.com/KYVENetwork/cometbft/v034x/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 f12c6fe6fec..052418a1e78 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/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/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 44caedd3e1f..dd5ef6b0be0 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/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) func testMux() *http.ServeMux { @@ -33,7 +33,7 @@ func statusOK(code int) bool { return code >= 200 && code <= 299 } // Ensure that nefarious/unintended inputs to `params` // do not crash our RPC handlers. -// See Issue https://github.com/tendermint/tendermint/issues/708. +// See Issue https://github.com/KYVENetwork/cometbft/v034x/issues/708. func TestRPCParams(t *testing.T) { mux := testMux() tests := []struct { diff --git a/rpc/jsonrpc/server/http_server.go b/rpc/jsonrpc/server/http_server.go index 29eae9fc32c..f8ce3f72266 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/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/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 72e87320737..47ef5639f47 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/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/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 ebed6eba431..a47272cf771 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/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) // HTTP + URI handler diff --git a/rpc/jsonrpc/server/parse_test.go b/rpc/jsonrpc/server/parse_test.go index 9f36adca79a..2f2895b2f24 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/tendermint/tendermint/libs/bytes" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + types "github.com/KYVENetwork/cometbft/v034x/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 8a5053666c5..c6dc02cd077 100644 --- a/rpc/jsonrpc/server/rpc_func.go +++ b/rpc/jsonrpc/server/rpc_func.go @@ -6,7 +6,7 @@ import ( "reflect" "strings" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/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 d42810fae5a..6aa23c2806c 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/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) // WebSocket handler @@ -449,7 +449,7 @@ func (wsc *wsConnection) writeRoutine() { // All writes to the websocket must (re)set the write deadline. // If some writes don't set it while others do, they may timeout incorrectly -// (https://github.com/tendermint/tendermint/issues/553) +// (https://github.com/KYVENetwork/cometbft/v034x/issues/553) func (wsc *wsConnection) writeMessageWithDeadline(msgType int, msg []byte) error { if err := wsc.baseConn.SetWriteDeadline(time.Now().Add(wsc.writeWait)); err != nil { return err diff --git a/rpc/jsonrpc/server/ws_handler_test.go b/rpc/jsonrpc/server/ws_handler_test.go index 42a96d1d343..9971db1c05b 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/tendermint/tendermint/libs/log" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) func TestWebsocketManagerHandler(t *testing.T) { diff --git a/rpc/jsonrpc/test/main.go b/rpc/jsonrpc/test/main.go index 912bcb98881..777007c9b8a 100644 --- a/rpc/jsonrpc/test/main.go +++ b/rpc/jsonrpc/test/main.go @@ -5,10 +5,10 @@ import ( "net/http" "os" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - rpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) var routes = map[string]*rpcserver.RPCFunc{ diff --git a/rpc/jsonrpc/types/types.go b/rpc/jsonrpc/types/types.go index 45fa0b380c0..45bb16c96db 100644 --- a/rpc/jsonrpc/types/types.go +++ b/rpc/jsonrpc/types/types.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - cmtjson "github.com/tendermint/tendermint/libs/json" + cmtjson "github.com/KYVENetwork/cometbft/v034x/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 f96b05ed150..839266f9c03 100644 --- a/rpc/openapi/openapi.yaml +++ b/rpc/openapi/openapi.yaml @@ -100,7 +100,7 @@ paths: 1. malicious node can drop or pretend it had committed your tx 2. malicious proposer (not necessary the one you're communicating with) can drop transactions, which might become valid in the future - (https://github.com/tendermint/tendermint/issues/3322) + (https://github.com/KYVENetwork/cometbft/v034x/issues/3322) Please refer to https://docs.cometbft.com/v0.34/core/using-cometbft.html#formatting @@ -144,7 +144,7 @@ paths: 1. malicious node can drop or pretend it had committed your tx 2. malicious proposer (not necessary the one you're communicating with) can drop transactions, which might become valid in the future - (https://github.com/tendermint/tendermint/issues/3322) + (https://github.com/KYVENetwork/cometbft/v034x/issues/3322) 3. node can be offline Please refer to @@ -1137,7 +1137,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/PubKeyEd25519" value: type: string example: "A6DoBUypNtUAyEHWtQ9bFjfNg8Bo9CrnkUGl6k6OHN4=" @@ -1581,7 +1581,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/PubKeyEd25519" value: type: string example: "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" @@ -1740,7 +1740,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/PubKeyEd25519" value: type: string example: "cOQZvh/h9ZioSeUMZB/1Vy1Xo5x2sjrVjlE/qHnYifM=" @@ -2666,7 +2666,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/PubKeyEd25519" value: type: string example: "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go index 34dc19a2d54..c1005c14a8a 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -8,18 +8,18 @@ import ( "strings" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - - cfg "github.com/tendermint/tendermint/config" - cmtnet "github.com/tendermint/tendermint/libs/net" - nm "github.com/tendermint/tendermint/node" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - core_grpc "github.com/tendermint/tendermint/rpc/grpc" - rpcclient "github.com/tendermint/tendermint/rpc/jsonrpc/client" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + nm "github.com/KYVENetwork/cometbft/v034x/node" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + ctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + core_grpc "github.com/KYVENetwork/cometbft/v034x/rpc/grpc" + rpcclient "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/client" ) // Options helps with specifying some parameters for our RPC testing for greater diff --git a/scripts/json2wal/main.go b/scripts/json2wal/main.go index 1a440b70fd9..ed48401f1fc 100644 --- a/scripts/json2wal/main.go +++ b/scripts/json2wal/main.go @@ -14,9 +14,9 @@ import ( "os" "strings" - cs "github.com/tendermint/tendermint/consensus" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/types" + cs "github.com/KYVENetwork/cometbft/v034x/consensus" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/types" ) func main() { diff --git a/scripts/mockery_generate.sh b/scripts/mockery_generate.sh index 8b97f91e287..2d5393ee18e 100755 --- a/scripts/mockery_generate.sh +++ b/scripts/mockery_generate.sh @@ -1,7 +1,7 @@ #!/bin/sh # # Invoke Mockery v2 to update generated mocks for the given type. -# Last change was made based on changes for main in https://github.com/tendermint/tendermint/pull/9196 +# Last change was made based on changes for main in https://github.com/KYVENetwork/cometbft/v034x/pull/9196 go run github.com/vektra/mockery/v2 --disable-version-string --case underscore --name "$*" diff --git a/scripts/wal2json/main.go b/scripts/wal2json/main.go index f82b4f71653..f5df9421daa 100644 --- a/scripts/wal2json/main.go +++ b/scripts/wal2json/main.go @@ -12,8 +12,8 @@ import ( "io" "os" - cs "github.com/tendermint/tendermint/consensus" - cmtjson "github.com/tendermint/tendermint/libs/json" + cs "github.com/KYVENetwork/cometbft/v034x/consensus" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" ) func main() { diff --git a/spec/abci/apps.md b/spec/abci/apps.md index 4296eaf952b..a048f1084cd 100644 --- a/spec/abci/apps.md +++ b/spec/abci/apps.md @@ -193,7 +193,7 @@ The `GasUsed` field is ignored completely by CometBFT. That said, applications s In the future, we intend to add a `Priority` field to the responses that can be used to explicitly prioritize txs in the mempool for inclusion in a block -proposal. See [#1861](https://github.com/tendermint/tendermint/issues/1861). +proposal. See [#1861](https://github.com/KYVENetwork/cometbft/v034x/issues/1861). ### CheckTx diff --git a/spec/consensus/evidence.md b/spec/consensus/evidence.md index b3f3de5c6a3..ed71e2fbe58 100644 --- a/spec/consensus/evidence.md +++ b/spec/consensus/evidence.md @@ -165,7 +165,7 @@ message Evidence { (gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // Total voting power of the validator set in case the ABCI application does // not store historical validators. - // https://github.com/tendermint/tendermint/issues/4581 + // https://github.com/KYVENetwork/cometbft/v034x/issues/4581 int64 total_voting_power = 5; } ``` diff --git a/spec/consensus/proposer-selection.md b/spec/consensus/proposer-selection.md index 885682f2fe4..8481a3ff0d2 100644 --- a/spec/consensus/proposer-selection.md +++ b/spec/consensus/proposer-selection.md @@ -179,7 +179,7 @@ In order to prevent this, when a new validator is added, its initial priority is where P is the total voting power of the set including V. -Curent implementation uses the penalty factor of 1.125 because it provides a small punishment that is efficient to calculate. See [here](https://github.com/tendermint/tendermint/pull/2785#discussion_r235038971) for more details. +Curent implementation uses the penalty factor of 1.125 because it provides a small punishment that is efficient to calculate. See [here](https://github.com/KYVENetwork/cometbft/v034x/pull/2785#discussion_r235038971) for more details. If we consider the validator set where p3 has just been added: diff --git a/spec/consensus/signing.md b/spec/consensus/signing.md index 38afe35022b..e0fc76f661c 100644 --- a/spec/consensus/signing.md +++ b/spec/consensus/signing.md @@ -229,4 +229,4 @@ easily be prevented by a signer. If enough validators simultaneously commit an amnesia attack, they may cause a fork of the blockchain, at which point an off-chain protocol must be engaged to collect votes from all the validators and determine who misbehaved. For more details, see [fork -detection](https://github.com/tendermint/tendermint/pull/3978). +detection](https://github.com/KYVENetwork/cometbft/v034x/pull/3978). diff --git a/spec/core/encoding.md b/spec/core/encoding.md index 0c2fdb1f63e..fb68c52a700 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/PubKeyEd25519", "value": "uZ4h63OFWuQ36ZZ4Bd6NF+/w9fWUwrOncrQsackrsTk=" } ``` @@ -301,4 +301,4 @@ in HSMs. It creates fixed offsets for relevant fields that need to be read in th For more details, see the [signing spec](../consensus/signing.md). Also, see the motivating discussion in -[#1622](https://github.com/tendermint/tendermint/issues/1622). +[#1622](https://github.com/KYVENetwork/cometbft/v034x/issues/1622). diff --git a/spec/ivy-proofs/docker-compose.yml b/spec/ivy-proofs/docker-compose.yml index e0612d4b1d0..ae6125b9ea9 100644 --- a/spec/ivy-proofs/docker-compose.yml +++ b/spec/ivy-proofs/docker-compose.yml @@ -3,5 +3,5 @@ services: tendermint-proof: build: . volumes: - - ./:/home/user/tendermint-proof:ro - - ./output:/home/user/tendermint-proof/output:rw + - ./:/home/user/cometbft-proof:ro + - ./output:/home/user/cometbft-proof/output:rw diff --git a/spec/light-client/detection/discussions.md b/spec/light-client/detection/discussions.md index 30d892e9215..4c6f21af40d 100644 --- a/spec/light-client/detection/discussions.md +++ b/spec/light-client/detection/discussions.md @@ -1,6 +1,6 @@ # Results of Discussions and Decisions -- Generating a minimal proof of fork (as suggested in [Issue #5083](https://github.com/tendermint/tendermint/issues/5083)) is too costly at the light client +- Generating a minimal proof of fork (as suggested in [Issue #5083](https://github.com/KYVENetwork/cometbft/v034x/issues/5083)) is too costly at the light client - we do not know all lightblocks from the primary - therefore there are many scenarios. we might even need to ask the primary again for additional lightblocks to isolate the @@ -30,7 +30,7 @@ - decision: "full" proof of fork consists of two traces that originate in the same lightblock and lead to conflicting headers of the same height. - + - For submission of proof of fork, we may do some optimizations, for instance, we might just submit a trace of lightblocks that verifies a block different from the one the full node knows (we do not send the trace @@ -44,7 +44,7 @@ - Observe that just two blocks for the same height are not sufficient proof of fork. One of the blocks may be bogus [CMBC-BOGUS.1] which does -not constitute slashable behavior. +not constitute slashable behavior. Which leads to the question whether the light node should try to do fork detection on its initial block (from subjective initialization). This could be done by doing backwards verification @@ -79,7 +79,7 @@ func Sequential-Supervisor () (Error) { loop { // get the next height nextHeight := input(); - + // Verify result := NoResult; while result != ResultSuccess { @@ -91,7 +91,7 @@ func Sequential-Supervisor () (Error) { Replace_Primary(); } } - + // Cross-check PoFs := Forkdetector(lightStore, PoFs); if PoFs.Empty { diff --git a/spec/light-client/detection/req-ibc-detection.md b/spec/light-client/detection/req-ibc-detection.md index ceffef1f84e..543394f094b 100644 --- a/spec/light-client/detection/req-ibc-detection.md +++ b/spec/light-client/detection/req-ibc-detection.md @@ -29,12 +29,12 @@ In the following, I distilled what I considered relevant from #### Some IBC links - [QueryConsensusState](https://github.com/cosmos/cosmos-sdk/blob/2651427ab4c6ea9f81d26afa0211757fc76cf747/x/ibc/02-client/client/utils/utils.go#L68) - + #### Required Changes in ICS 007 - `assert(height > 0)` in definition of `initialize` doesn't match definition of `Height` as *(epoch,height)* pair. - + - `initialize` needs to be updated to new data structures - `clientState.frozenHeight` semantics seem not totally consistent in @@ -60,14 +60,14 @@ In the following, I distilled what I considered relevant from retrieval of past consensus states by height (as opposed to just the current consensus state) is convenient but not required." For Cosmos fork detection, this seems to be a necessity. - + - `Header` should become a lightblock - `Evidence` should become `LightNodeProofOfFork` [LCV-DATA-POF.1] - `upgradeClientState` what is the semantics (in particular what is `height` doing?). - + - `checkMisbehaviorAndUpdateState(cs: ClientState, PoF: LightNodeProofOfFork)` needs to be adapted @@ -76,12 +76,12 @@ In the following, I distilled what I considered relevant from A blockchain runs a **handler** that passively collects information about other blockchains. It can be thought of a state machine that takes input events. - + - the state includes a lightstore (I guess called `ConsensusState` in IBC) - The following function is used to pass a header to a handler - + ```go type checkValidityAndUpdateState = (Header) => Void ``` @@ -102,7 +102,7 @@ type checkValidityAndUpdateState = (Header) => Void - The following function is used to pass "evidence" (this we will need to make precise eventually) to a handler - + ```go type checkMisbehaviorAndUpdateState = (bytes) => Void ``` @@ -128,29 +128,29 @@ type queryChainConsensusState = (height: uint64) => ConsensusState `checkValidityAndUpdateState` and `checkMisbehaviorAndUpdateState`. It may also query `queryChainConsensusState`. - + - multiple relayers may talk to one handler. Some relayers might be faulty. We assume existence of at least single correct relayer. ## Informal Problem Statement: Fork detection in IBC - + ### Relayer requirement: Evidence for Handler - The relayer should provide the handler with "evidence" that there was a fork. - + - The relayer can read the handler's consensus state. Thus the relayer can feed the handler precisely the information the handler needs to detect a fork. What is this information needs to be specified. - + - The information depends on the verification the handler does. It might be necessary to provide a bisection proof (list of lightblocks) so that the handler can verify based on its local lightstore a header *h* that is conflicting with a header *h'* in the local lightstore, that is, *h != h'* and *h.Height = h'.Height* - + ### Relayer requirement: Fork detection Let's assume there is a fork at chain A. There are two ways the @@ -166,17 +166,17 @@ relayer can figure that out: - in both detection scenarios, the relayer should submit evidence to full nodes of chain A where there is a fork. As we assume a fullnode has a complete list of blocks, it is sufficient to send "Bucky's - evidence" (), + evidence" (), that is, - two lightblocks from different branches + - a lightblock (perhaps just a height) from which both blocks can be verified. - + - in the scenario 2., the relayer must feed the A-handler (on chain B) a proof of a fork on A so that chain B can react accordingly - + ### Handler requirement - + - there are potentially many relayers, some correct some faulty - a handler cannot trust the information provided by the relayer, @@ -185,7 +185,7 @@ relayer can figure that out: - in case of a fork, we accept that the handler temporarily stores headers (tagged as verified). - + - eventually, a handler should be informed (`checkMisbehaviorAndUpdateState`) by some relayer that it has @@ -205,7 +205,7 @@ relayer can figure that out: *h* in the lightstore. If verification fails, we need to download the "alternative" header of height *h.Height* to generate evidence for the handler. - + - we have to specify what precisely `queryChainConsensusState` returns. It cannot be the complete lightstore. Is the last header enough? @@ -214,7 +214,7 @@ relayer can figure that out: different branch than the relayer. And we would like that this is enough to achieve the Handler requirement. - + - here the correctness argument would be easy if a correct relayer is based on a light client with a *trusted* state, that is, a light client who never changes its opinion about trusted. Then if such a @@ -272,11 +272,11 @@ In principle everyone can detect a fork accountability" protocol to generate evidence in the form of consensus messages. So perhaps we should introduce different terms for: - + - proof of fork for the handler (basically consisting of lightblocks) - proof of fork for a full node (basically consisting of (fewer) lightblocks) - proof of misbehavior (consensus messages) - + ### Isolating misbehaving nodes - this is the job of a full node. @@ -285,7 +285,7 @@ In principle everyone can detect a fork full node believes is the "correct" chain. Right now we postulate that every full node is on the correct chain, that is, there is no fork on the chain. - + - The full node figures out which nodes are - lunatic - double signing @@ -320,10 +320,10 @@ In principle everyone can detect a fork fork detection and misbehavior isolation. So it should be produced by protocols (light client, the relayer). So we should fix that first. - + - Given the problems of not having a light client architecture spec, for the relayer we should start with this. E.g. - + - the relayer runs light clients for two chains - the relayer regularly queries consensus state of a handler - the relayer needs to check the consensus state diff --git a/spec/p2p/v0.34/peer_manager.md b/spec/p2p/v0.34/peer_manager.md index ba2e75ef323..ee5a61a04df 100644 --- a/spec/p2p/v0.34/peer_manager.md +++ b/spec/p2p/v0.34/peer_manager.md @@ -78,14 +78,14 @@ seed node are added to the address book. As a result, in the next invocation of the `ensurePeers` method, the node should be able to dial some of the peer addresses provided by the seed node. -However, as observed in this [issue](https://github.com/tendermint/tendermint/issues/2093), +However, as observed in this [issue](https://github.com/KYVENetwork/cometbft/v034x/issues/2093), it can take some time, up to `ensurePeersPeriod` or 30 seconds, from when the node receives new peer addresses and when it dials the received addresses. To avoid this delay, which can be particularly relevant when the node has no peers, a node immediately attempts to dial peer addresses when they are received from a peer that is locally configured as a seed node. -> FIXME: The current logic was introduced in [#3762](https://github.com/tendermint/tendermint/pull/3762). +> FIXME: The current logic was introduced in [#3762](https://github.com/KYVENetwork/cometbft/v034x/pull/3762). > Although it fix the issue, the delay between receiving an address and dialing > the peer, it does not impose and limit on how many addresses are dialed in this > scenario. @@ -93,7 +93,7 @@ received from a peer that is locally configured as a seed node. > current number of outbound peers, the number of dialing routines, or the > `MaxNumOutboundPeers` parameter. > -> Issue [#9548](https://github.com/tendermint/tendermint/issues/9548) was +> Issue [#9548](https://github.com/KYVENetwork/cometbft/v034x/issues/9548) was > created to handle this situation. ### First round diff --git a/spec/p2p/v0.34/switch.md b/spec/p2p/v0.34/switch.md index 1d50108f2b9..5398e63f66f 100644 --- a/spec/p2p/v0.34/switch.md +++ b/spec/p2p/v0.34/switch.md @@ -173,7 +173,7 @@ precisely, not providing to the switch any "reason" for that. In both cases the `Peer` instance is stopped, the peer is removed from all registered reactors, and finally from the list of connected peers. -> Issue is mentioned in +> Issue is mentioned in > the internal `stopAndRemovePeer` method explaining why removing the peer from > the list of connected peers is the last action taken. diff --git a/spec/p2p/v0.34/transport.md b/spec/p2p/v0.34/transport.md index 99aebdd7373..e6986a7a677 100644 --- a/spec/p2p/v0.34/transport.md +++ b/spec/p2p/v0.34/transport.md @@ -71,7 +71,7 @@ as well any error returned in this process are added to a queue of accepted conn This queue is consumed by the `Accept` method. > Handling accepted connection asynchronously was introduced due to this issue: -> +> ## Connection Filtering @@ -219,4 +219,4 @@ For this reason, this method is not invoked with a started transport. [peer-sts]: https://github.com/cometbft/cometbft/blob/v0.34.x/spec/p2p/peer.md#authenticated-encryption-handshake [peer-handshake]:https://github.com/cometbft/cometbft/blob/v0.34.x/spec/p2p/peer.md#cometbft-version-handshake [sts-paper]: https://link.springer.com/article/10.1007/BF00124891 -[sts-paper-pdf]: https://github.com/tendermint/tendermint/blob/0.1/docs/sts-final.pdf +[sts-paper-pdf]: https://github.com/KYVENetwork/cometbft/v034x/blob/0.1/docs/sts-final.pdf diff --git a/spec/rpc/README.md b/spec/rpc/README.md index ff9ce2ce9e4..d2f1a3ad1c6 100644 --- a/spec/rpc/README.md +++ b/spec/rpc/README.md @@ -17,7 +17,7 @@ This file defines the JSON-RPC spec of CometBFT. This is meant to be implemented | HTTP | ✅ | ✅ | | HTTPS | ✅ | ❌ | | WS | ✅ | ✅ | - + | Routes | [CometBFT](https://github.com/cometbft/cometbft/) | [Tendermint-Rs](https://github.com/informalsystems/tendermint-rs) | |-----------------------------------------|:----------------------------------------------------------:|:-----------------------------------------------------------------:| | [Health](#health) | ✅ | ✅ | @@ -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/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/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/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/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/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/PubKeyEd25519", "value": "cOQZvh/h9ZioSeUMZB/1Vy1Xo5x2sjrVjlE/qHnYifM=" }, "power": "9328525", diff --git a/state/execution.go b/state/execution.go index fe49e6542ff..ff0bda9588c 100644 --- a/state/execution.go +++ b/state/execution.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/libs/fail" - "github.com/tendermint/tendermint/libs/log" - mempl "github.com/tendermint/tendermint/mempool" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/libs/fail" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/state/execution_test.go b/state/execution_test.go index 474f6f8303f..78cc58f8794 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -2,6 +2,7 @@ package state_test import ( "context" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "testing" "time" @@ -9,21 +10,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/log" - mmock "github.com/tendermint/tendermint/mempool/mock" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + mmock "github.com/KYVENetwork/cometbft/v034x/mempool/mock" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" ) var ( diff --git a/state/export_test.go b/state/export_test.go index 7de36ee1df3..14f30496ac5 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -3,10 +3,10 @@ package state import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // diff --git a/state/helpers_test.go b/state/helpers_test.go index cdaffe8b68e..330dd09ad34 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -7,16 +7,16 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) type paramsChangeTestCase struct { diff --git a/state/indexer/block.go b/state/indexer/block.go index 9c4bb0e54a3..9ed99ae409b 100644 --- a/state/indexer/block.go +++ b/state/indexer/block.go @@ -3,8 +3,8 @@ package indexer import ( "context" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/types" ) //go:generate ../../scripts/mockery_generate.sh BlockIndexer diff --git a/state/indexer/block/kv/kv.go b/state/indexer/block/kv/kv.go index a20e3c7afb5..4cbfead8cd3 100644 --- a/state/indexer/block/kv/kv.go +++ b/state/indexer/block/kv/kv.go @@ -13,10 +13,10 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/google/orderedcode" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/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 e3caca6df26..0882467c1b9 100644 --- a/state/indexer/block/kv/kv_test.go +++ b/state/indexer/block/kv/kv_test.go @@ -8,10 +8,10 @@ import ( db "github.com/cometbft/cometbft-db" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + blockidxkv "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestBlockIndexer(t *testing.T) { diff --git a/state/indexer/block/kv/util.go b/state/indexer/block/kv/util.go index 6b44c8cf67e..5c4630048a5 100644 --- a/state/indexer/block/kv/util.go +++ b/state/indexer/block/kv/util.go @@ -8,9 +8,9 @@ import ( "github.com/google/orderedcode" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/types" ) type HeightInfo struct { diff --git a/state/indexer/block/null/null.go b/state/indexer/block/null/null.go index d36d8680e46..823b4ade9d4 100644 --- a/state/indexer/block/null/null.go +++ b/state/indexer/block/null/null.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/types" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/mocks/block_indexer.go b/state/indexer/mocks/block_indexer.go index 2c0f0ecb073..589b22a084c 100644 --- a/state/indexer/mocks/block_indexer.go +++ b/state/indexer/mocks/block_indexer.go @@ -7,9 +7,9 @@ import ( mock "github.com/stretchr/testify/mock" - query "github.com/tendermint/tendermint/libs/pubsub/query" + query "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/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 20ac70cd8d6..081b9934e65 100644 --- a/state/indexer/query_range.go +++ b/state/indexer/query_range.go @@ -4,8 +4,8 @@ import ( "math/big" "time" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/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 c63c3037bea..00d3ab6f8c1 100644 --- a/state/indexer/sink/psql/backport.go +++ b/state/indexer/sink/psql/backport.go @@ -17,10 +17,10 @@ import ( "context" "errors" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/state/indexer/sink/psql/backport_test.go b/state/indexer/sink/psql/backport_test.go index d85022247d6..39b252668d2 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/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" ) var ( diff --git a/state/indexer/sink/psql/psql.go b/state/indexer/sink/psql/psql.go index 638a37ecc11..254cc6935b9 100644 --- a/state/indexer/sink/psql/psql.go +++ b/state/indexer/sink/psql/psql.go @@ -11,9 +11,9 @@ import ( "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/state/indexer/sink/psql/psql_test.go b/state/indexer/sink/psql/psql_test.go index e0a29b7b193..2b88a1bd1fd 100644 --- a/state/indexer/sink/psql/psql_test.go +++ b/state/indexer/sink/psql/psql_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/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 4493a6e3f2c..0a1e90d1579 100644 --- a/state/mocks/block_store.go +++ b/state/mocks/block_store.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/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 7279d36f710..9603245b2c3 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -4,9 +4,9 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/KYVENetwork/cometbft/v034x/state" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/types" ) // EvidencePool is an autogenerated mock type for the EvidencePool type diff --git a/state/mocks/store.go b/state/mocks/store.go index 8cbe490800b..36c9ffa836a 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -4,13 +4,13 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/KYVENetwork/cometbft/v034x/state" - tendermintstate "github.com/tendermint/tendermint/proto/tendermint/state" + tendermintstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" - tenderminttypes "github.com/tendermint/tendermint/types" + tenderminttypes "github.com/KYVENetwork/cometbft/v034x/types" - types "github.com/tendermint/tendermint/proto/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // Store is an autogenerated mock type for the Store type diff --git a/state/rollback.go b/state/rollback.go index c816ae589e6..a78cfd51ddc 100644 --- a/state/rollback.go +++ b/state/rollback.go @@ -3,10 +3,10 @@ package state import ( "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/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 38d5e6e1dbe..9b377c1db39 100644 --- a/state/rollback_test.go +++ b/state/rollback_test.go @@ -2,19 +2,19 @@ package state_test import ( "crypto/rand" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "testing" dbm "github.com/cometbft/cometbft-db" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) func TestRollback(t *testing.T) { diff --git a/state/services.go b/state/services.go index 2b6c16fed2f..66091ccb001 100644 --- a/state/services.go +++ b/state/services.go @@ -1,7 +1,7 @@ package state import ( - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) //------------------------------------------------------ diff --git a/state/state.go b/state/state.go index 5fea7d224a3..96fc1f67db6 100644 --- a/state/state.go +++ b/state/state.go @@ -4,17 +4,17 @@ import ( "bytes" "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" "os" "time" "github.com/gogo/protobuf/proto" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" ) // database key diff --git a/state/state_test.go b/state/state_test.go index 4ce87ddce7c..4601ab9b752 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -13,15 +13,15 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) // setupTestCase does setup common to all test cases. @@ -441,7 +441,7 @@ func testProposerFreq(t *testing.T, caseNum int, valSet *types.ValidatorSet) { } // TestProposerPriorityDoesNotGetResetToZero assert that we preserve accum when calling updateState -// see https://github.com/tendermint/tendermint/issues/2718 +// see https://github.com/KYVENetwork/cometbft/v034x/issues/2718 func TestProposerPriorityDoesNotGetResetToZero(t *testing.T) { tearDown, _, state := setupTestCase(t) defer tearDown(t) @@ -773,7 +773,7 @@ func TestLargeGenesisValidator(t *testing.T) { // add more validators with same voting power as the 2nd // let the genesis validator "unbond", // see how long it takes until the effect wears off and both begin to alternate - // see: https://github.com/tendermint/tendermint/issues/2960 + // see: https://github.com/KYVENetwork/cometbft/v034x/issues/2960 firstAddedValPubKey := ed25519.GenPrivKey().PubKey() firstAddedValVotingPower := int64(10) fvp, err := cryptoenc.PubKeyToProto(firstAddedValPubKey) diff --git a/state/store.go b/state/store.go index 3fbadccdc0b..263258f28ea 100644 --- a/state/store.go +++ b/state/store.go @@ -7,18 +7,18 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( // persist validators every valSetCheckpointInterval blocks to avoid // LoadValidators taking too much time. - // https://github.com/tendermint/tendermint/pull/3438 + // https://github.com/KYVENetwork/cometbft/v034x/pull/3438 // 100000 results in ~ 100ms to get 100 validators (see BenchmarkLoadValidators) valSetCheckpointInterval = 100000 ) @@ -237,7 +237,7 @@ func (store dbStore) Bootstrap(state State) error { // e.g. `LastHeightChanged` must remain. The state at to must also exist. // // The from parameter is necessary since we can't do a key scan in a performant way due to the key -// encoding not preserving ordering: https://github.com/tendermint/tendermint/issues/4567 +// encoding not preserving ordering: https://github.com/KYVENetwork/cometbft/v034x/issues/4567 // This will cause some old states to be left behind when doing incremental partial prunes, // specifically older checkpoints and LastHeightChanged targets. func (store dbStore) PruneStates(from int64, to int64) error { diff --git a/state/store_test.go b/state/store_test.go index 4db5fb58623..e8fa29f74e5 100644 --- a/state/store_test.go +++ b/state/store_test.go @@ -10,13 +10,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestStoreLoadValidators(t *testing.T) { diff --git a/state/tx_filter.go b/state/tx_filter.go index 52d05596608..e18710962e0 100644 --- a/state/tx_filter.go +++ b/state/tx_filter.go @@ -1,8 +1,8 @@ package state import ( - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/types" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/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 63fd34b1b37..c97abb5e060 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/tendermint/tendermint/libs/rand" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestTxFilter(t *testing.T) { diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index 5fa50ac2fdd..40cb4f39680 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -4,8 +4,8 @@ import ( "context" "errors" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/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 48861bca445..0aea5ad2479 100644 --- a/state/txindex/indexer_service.go +++ b/state/txindex/indexer_service.go @@ -3,9 +3,9 @@ package txindex import ( "context" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/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 6b8dadc70be..bcfa53b8970 100644 --- a/state/txindex/indexer_service_test.go +++ b/state/txindex/indexer_service_test.go @@ -7,12 +7,12 @@ import ( db "github.com/cometbft/cometbft-db" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/state/txindex/kv" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + blockidxkv "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestIndexerServiceIndexesBlocks(t *testing.T) { diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index 8ed57934d9e..27f9d77611d 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -12,11 +12,11 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/state/txindex/kv/kv_bench_test.go b/state/txindex/kv/kv_bench_test.go index ebe6e281298..f5fb55ed1f2 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/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/types" ) func BenchmarkTxSearch(b *testing.B) { diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index 60b4047fca8..eae54e3002e 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/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/types" ) func TestBigInt(t *testing.T) { @@ -649,7 +649,7 @@ func TestTxSearchMultipleTxs(t *testing.T) { require.NoError(t, err) // indexed fourth (to test we don't include txs with similar events) - // https://github.com/tendermint/tendermint/issues/2908 + // https://github.com/KYVENetwork/cometbft/v034x/issues/2908 txResult4 := txResultWithEvents([]abci.Event{ {Type: "account", Attributes: []abci.EventAttribute{{Key: []byte("number.id"), Value: []byte("1"), Index: true}}}, }) diff --git a/state/txindex/kv/utils.go b/state/txindex/kv/utils.go index 3dfa49b76a3..66774b83543 100644 --- a/state/txindex/kv/utils.go +++ b/state/txindex/kv/utils.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + "github.com/KYVENetwork/cometbft/v034x/types" "github.com/google/orderedcode" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/indexer" - "github.com/tendermint/tendermint/types" ) type HeightInfo struct { diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go index 93d0eb9c257..1e8840197a5 100644 --- a/state/txindex/mocks/tx_indexer.go +++ b/state/txindex/mocks/tx_indexer.go @@ -6,11 +6,11 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - query "github.com/tendermint/tendermint/libs/pubsub/query" + query "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" - txindex "github.com/tendermint/tendermint/state/txindex" + txindex "github.com/KYVENetwork/cometbft/v034x/state/txindex" - types "github.com/tendermint/tendermint/abci/types" + types "github.com/KYVENetwork/cometbft/v034x/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 98e4db79e76..c2e0cc7a5a6 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -4,9 +4,9 @@ import ( "context" "errors" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/pubsub/query" - "github.com/tendermint/tendermint/state/txindex" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" ) var _ txindex.TxIndexer = (*TxIndex)(nil) diff --git a/state/validation.go b/state/validation.go index 0ebe37bf903..ba0aef24057 100644 --- a/state/validation.go +++ b/state/validation.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------- diff --git a/state/validation_test.go b/state/validation_test.go index 209b88800d6..652006a2da4 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -8,16 +8,16 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/log" - memmock "github.com/tendermint/tendermint/mempool/mock" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/mocks" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + memmock "github.com/KYVENetwork/cometbft/v034x/mempool/mock" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const validationTestsStopHeight int64 = 10 diff --git a/statesync/chunks.go b/statesync/chunks.go index 4948f10b81c..1c2e67377b3 100644 --- a/statesync/chunks.go +++ b/statesync/chunks.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/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 3bc42e6aad8..0ee7dc1fd24 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/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) func setupChunkQueue(t *testing.T) (*chunkQueue, func()) { diff --git a/statesync/messages.go b/statesync/messages.go index 8eba205101d..8e432c57c2a 100644 --- a/statesync/messages.go +++ b/statesync/messages.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" ) const ( diff --git a/statesync/messages_test.go b/statesync/messages_test.go index c913421d1c9..8581d7b996f 100644 --- a/statesync/messages_test.go +++ b/statesync/messages_test.go @@ -7,9 +7,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/p2p" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/p2p" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func TestValidateMsg(t *testing.T) { diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index f52b9e33d2d..13224315e7c 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -6,9 +6,9 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - state "github.com/tendermint/tendermint/state" + state "github.com/KYVENetwork/cometbft/v034x/state" - types "github.com/tendermint/tendermint/types" + types "github.com/KYVENetwork/cometbft/v034x/types" ) // StateProvider is an autogenerated mock type for the StateProvider type diff --git a/statesync/reactor.go b/statesync/reactor.go index d8aa5b2a7df..ceb28ff6156 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -7,14 +7,14 @@ import ( "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/statesync/reactor_test.go b/statesync/reactor_test.go index 16c1b1a5da9..79c5e0f5cb0 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/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/p2p" - p2pmocks "github.com/tendermint/tendermint/p2p/mocks" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - proxymocks "github.com/tendermint/tendermint/proxy/mocks" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v034x/p2p/mocks" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" + proxymocks "github.com/KYVENetwork/cometbft/v034x/proxy/mocks" ) func TestReactor_Receive_ChunkRequest(t *testing.T) { diff --git a/statesync/snapshots.go b/statesync/snapshots.go index efe705cc24e..28ca1286ccc 100644 --- a/statesync/snapshots.go +++ b/statesync/snapshots.go @@ -6,8 +6,8 @@ import ( "math/rand" "sort" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) // snapshotKey is a snapshot key used for lookups. diff --git a/statesync/snapshots_test.go b/statesync/snapshots_test.go index 28ed30eee9c..62c39dd6876 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/tendermint/tendermint/p2p" - p2pmocks "github.com/tendermint/tendermint/p2p/mocks" + "github.com/KYVENetwork/cometbft/v034x/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v034x/p2p/mocks" ) func TestSnapshot_Key(t *testing.T) { diff --git a/statesync/stateprovider.go b/statesync/stateprovider.go index 2dbca08939f..9e3d3c5c643 100644 --- a/statesync/stateprovider.go +++ b/statesync/stateprovider.go @@ -8,18 +8,18 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/light" - lightprovider "github.com/tendermint/tendermint/light/provider" - lighthttp "github.com/tendermint/tendermint/light/provider/http" - lightrpc "github.com/tendermint/tendermint/light/rpc" - lightdb "github.com/tendermint/tendermint/light/store/db" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/light" + lightprovider "github.com/KYVENetwork/cometbft/v034x/light/provider" + lighthttp "github.com/KYVENetwork/cometbft/v034x/light/provider/http" + lightrpc "github.com/KYVENetwork/cometbft/v034x/light/rpc" + lightdb "github.com/KYVENetwork/cometbft/v034x/light/store/db" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) //go:generate ../scripts/mockery_generate.sh StateProvider diff --git a/statesync/syncer.go b/statesync/syncer.go index c057c324e2c..adb79d17723 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -7,16 +7,16 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/light" - "github.com/tendermint/tendermint/p2p" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/light" + "github.com/KYVENetwork/cometbft/v034x/p2p" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index 769107d7e52..5fa697a0ffc 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -2,6 +2,7 @@ package statesync import ( "errors" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "testing" "time" @@ -9,21 +10,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - p2pmocks "github.com/tendermint/tendermint/p2p/mocks" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - ssproto "github.com/tendermint/tendermint/proto/tendermint/statesync" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/proxy" - proxymocks "github.com/tendermint/tendermint/proxy/mocks" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/statesync/mocks" - "github.com/tendermint/tendermint/types" - "github.com/tendermint/tendermint/version" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v034x/p2p/mocks" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + ssproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/statesync" + "github.com/KYVENetwork/cometbft/v034x/proxy" + proxymocks "github.com/KYVENetwork/cometbft/v034x/proxy/mocks" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/statesync/mocks" + "github.com/KYVENetwork/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) const testAppVersion = 9 diff --git a/store/store.go b/store/store.go index 3a2fd1aa73c..5fe0fa49a05 100644 --- a/store/store.go +++ b/store/store.go @@ -7,10 +7,10 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/gogo/protobuf/proto" - cmtsync "github.com/tendermint/tendermint/libs/sync" - cmtstore "github.com/tendermint/tendermint/proto/tendermint/store" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + cmtstore "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/store" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) /* @@ -37,7 +37,7 @@ type BlockStore struct { // fine-grained concurrency control for its data, and thus this mutex does not apply to // database contents. The only reason for keeping these fields in the struct is that the data // can't efficiently be queried from the database since the key encoding we use is not - // lexicographically ordered (see https://github.com/tendermint/tendermint/issues/4567). + // lexicographically ordered (see https://github.com/KYVENetwork/cometbft/v034x/issues/4567). mtx cmtsync.RWMutex base int64 height int64 diff --git a/store/store_test.go b/store/store_test.go index 0e0e8083221..10fd6191f4d 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -4,6 +4,7 @@ import ( "bytes" "encoding/json" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "os" "runtime/debug" "strings" @@ -15,16 +16,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtstore "github.com/tendermint/tendermint/proto/tendermint/store" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtstore "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/store" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/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 d171784b240..10ac20d5ea2 100644 --- a/test/app/grpc_client.go +++ b/test/app/grpc_client.go @@ -7,8 +7,8 @@ import ( "context" - cmtjson "github.com/tendermint/tendermint/libs/json" - coregrpc "github.com/tendermint/tendermint/rpc/grpc" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + coregrpc "github.com/KYVENetwork/cometbft/v034x/rpc/grpc" ) var grpcAddr = "tcp://localhost:36656" diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 60fe89dea1d..e0201d2ea22 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -9,10 +9,10 @@ import ( "path/filepath" "strconv" - "github.com/tendermint/tendermint/abci/example/code" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/abci/example/code" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/version" ) const appVersion = 1 diff --git a/test/e2e/app/snapshots.go b/test/e2e/app/snapshots.go index c460fde271f..6184c3e69dd 100644 --- a/test/e2e/app/snapshots.go +++ b/test/e2e/app/snapshots.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" ) const ( diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go index a78608328d5..e4f97db4c30 100644 --- a/test/e2e/generator/generate.go +++ b/test/e2e/generator/generate.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/version" "github.com/Masterminds/semver/v3" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/version" ) var ( @@ -34,7 +34,7 @@ var ( // The following specify randomly chosen values for testnet nodes. nodeDatabases = uniformChoice{"goleveldb", "cleveldb", "rocksdb", "boltdb", "badgerdb"} ipv6 = uniformChoice{false, true} - // FIXME: grpc disabled due to https://github.com/tendermint/tendermint/issues/5439 + // FIXME: grpc disabled due to https://github.com/KYVENetwork/cometbft/v034x/issues/5439 nodeABCIProtocols = uniformChoice{"unix", "tcp", "builtin"} // "grpc" nodePrivvalProtocols = uniformChoice{"file", "unix", "tcp"} // FIXME: v2 disabled due to flake @@ -54,7 +54,7 @@ var ( nodeMisbehaviors = weightedChoice{ // FIXME: evidence disabled due to node panicking when not // having sufficient block history to process evidence. - // https://github.com/tendermint/tendermint/issues/5617 + // https://github.com/KYVENetwork/cometbft/v034x/issues/5617 // misbehaviorOption{"double-prevote"}: 1, misbehaviorOption{}: 9, } @@ -350,7 +350,7 @@ func (m misbehaviorOption) atHeight(height int64) map[string]string { // Parses strings like "v0.34.21:1,v0.34.22:2" to represent two versions // ("v0.34.21" and "v0.34.22") with weights of 1 and 2 respectively. // Versions may be specified as cometbft/e2e-node:v0.34.27-alpha.1:1 or -// ghcr.io/informalsystems/tendermint:v0.34.26:1. +// ghcr.io/informalsystems/cometbft:v0.34.26:1. // If only the tag and weight are specified, cometbft/e2e-node is assumed. // Also returns the last version in the list, which will be used for updates. func parseWeightedVersions(s string) (weightedChoice, string, error) { diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go index 8db1ee33fa0..63abc6fe7fe 100644 --- a/test/e2e/generator/main.go +++ b/test/e2e/generator/main.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/log" ) const ( diff --git a/test/e2e/node/config.go b/test/e2e/node/config.go index 6941d0a1c91..e7053a8de05 100644 --- a/test/e2e/node/config.go +++ b/test/e2e/node/config.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" - "github.com/tendermint/tendermint/test/e2e/app" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/app" ) // Config is the application configuration. diff --git a/test/e2e/node/main.go b/test/e2e/node/main.go index 1105cb7955c..7b606b439f8 100644 --- a/test/e2e/node/main.go +++ b/test/e2e/node/main.go @@ -13,25 +13,25 @@ import ( "github.com/spf13/viper" - "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtflags "github.com/tendermint/tendermint/libs/cli/flags" - "github.com/tendermint/tendermint/libs/log" - cmtnet "github.com/tendermint/tendermint/libs/net" - "github.com/tendermint/tendermint/light" - lproxy "github.com/tendermint/tendermint/light/proxy" - lrpc "github.com/tendermint/tendermint/light/rpc" - dbs "github.com/tendermint/tendermint/light/store/db" - "github.com/tendermint/tendermint/node" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - "github.com/tendermint/tendermint/test/e2e/app" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - mcs "github.com/tendermint/tendermint/test/maverick/consensus" - maverick "github.com/tendermint/tendermint/test/maverick/node" + "github.com/KYVENetwork/cometbft/v034x/abci/server" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtflags "github.com/KYVENetwork/cometbft/v034x/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v034x/libs/net" + "github.com/KYVENetwork/cometbft/v034x/light" + lproxy "github.com/KYVENetwork/cometbft/v034x/light/proxy" + lrpc "github.com/KYVENetwork/cometbft/v034x/light/rpc" + dbs "github.com/KYVENetwork/cometbft/v034x/light/store/db" + "github.com/KYVENetwork/cometbft/v034x/node" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/app" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + mcs "github.com/KYVENetwork/cometbft/v034x/test/maverick/consensus" + maverick "github.com/KYVENetwork/cometbft/v034x/test/maverick/node" ) var logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout)) @@ -182,7 +182,7 @@ func startLightClient(cfg *Config) error { rpccfg.MaxOpenConnections = cmtcfg.RPC.MaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if rpccfg.WriteTimeout <= cmtcfg.RPC.TimeoutBroadcastTxCommit { rpccfg.WriteTimeout = cmtcfg.RPC.TimeoutBroadcastTxCommit + 1*time.Second } diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 78a606ce256..61bbff4f718 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -7,8 +7,8 @@ import ( "strconv" "text/template" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/test/e2e/pkg/infra" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg/infra" ) var _ infra.Provider = &Provider{} @@ -89,7 +89,7 @@ services: - 6060 volumes: - ./{{ .Name }}:/cometbft - - ./{{ .Name }}:/tendermint + - ./{{ .Name }}:/cometbft networks: {{ $.Name }}: ipv{{ if $.IPv6 }}6{{ else }}4{{ end}}_address: {{ .IP }} @@ -116,7 +116,7 @@ services: - 6060 volumes: - ./{{ .Name }}:/cometbft - - ./{{ .Name }}:/tendermint + - ./{{ .Name }}:/cometbft networks: {{ $.Name }}: ipv{{ if $.IPv6 }}6{{ else }}4{{ end}}_address: {{ .IP }} diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go index 2e803555426..f416dbda514 100644 --- a/test/e2e/pkg/testnet.go +++ b/test/e2e/pkg/testnet.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/secp256k1" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - mcs "github.com/tendermint/tendermint/test/maverick/consensus" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/secp256k1" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + mcs "github.com/KYVENetwork/cometbft/v034x/test/maverick/consensus" ) const ( diff --git a/test/e2e/runner/benchmark.go b/test/e2e/runner/benchmark.go index 545fb773d8c..c7bde78267d 100644 --- a/test/e2e/runner/benchmark.go +++ b/test/e2e/runner/benchmark.go @@ -6,8 +6,8 @@ import ( "math" "time" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/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 92e305cc56c..7b1e732d914 100644 --- a/test/e2e/runner/cleanup.go +++ b/test/e2e/runner/cleanup.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/tendermint/tendermint/libs/log" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" ) // Cleanup removes the Docker Compose containers and testnet directory. diff --git a/test/e2e/runner/load.go b/test/e2e/runner/load.go index 6ad32d41c7e..a02a055f8cd 100644 --- a/test/e2e/runner/load.go +++ b/test/e2e/runner/load.go @@ -7,12 +7,12 @@ import ( "sync" "time" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v034x/types" "github.com/google/uuid" - "github.com/tendermint/tendermint/libs/log" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/test/loadtime/payload" - "github.com/tendermint/tendermint/types" ) const workerPoolSize = 16 diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index f4c8fd60a4e..2df250a00a5 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/log" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/test/e2e/pkg/infra" - "github.com/tendermint/tendermint/test/e2e/pkg/infra/docker" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg/infra" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg/infra/docker" ) var ( @@ -259,7 +259,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 99298670028..462febce265 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/log" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" ) // Perturbs a running testnet. diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go index 39792ba07d4..6c65fa50dfd 100644 --- a/test/e2e/runner/rpc.go +++ b/test/e2e/runner/rpc.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/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 594d28c4949..ea34c7e2d41 100644 --- a/test/e2e/runner/setup.go +++ b/test/e2e/runner/setup.go @@ -16,14 +16,14 @@ import ( "github.com/BurntSushi/toml" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/test/e2e/pkg/infra" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/privval" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg/infra" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go index b9e1d8ad194..3548a1dc3a4 100644 --- a/test/e2e/runner/start.go +++ b/test/e2e/runner/start.go @@ -5,8 +5,8 @@ import ( "sort" "time" - "github.com/tendermint/tendermint/libs/log" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" ) func Start(testnet *e2e.Testnet) error { diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go index 834ce6f2d04..3cbc62ba67a 100644 --- a/test/e2e/runner/test.go +++ b/test/e2e/runner/test.go @@ -3,7 +3,7 @@ package main import ( "os" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" ) // Test runs test cases under tests/ diff --git a/test/e2e/runner/wait.go b/test/e2e/runner/wait.go index d89a8baaccd..713a0061bcc 100644 --- a/test/e2e/runner/wait.go +++ b/test/e2e/runner/wait.go @@ -3,8 +3,8 @@ package main import ( "time" - "github.com/tendermint/tendermint/libs/log" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + e2e "github.com/KYVENetwork/cometbft/v034x/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 8b8d23960fd..0a27c41c03a 100644 --- a/test/e2e/tests/app_test.go +++ b/test/e2e/tests/app_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/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 b3f4e9139f2..a4107bd9b8b 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/tendermint/tendermint/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v034x/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 5df3309d418..d386ba36bbe 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/tendermint/tendermint/rpc/client/http" - rpctypes "github.com/tendermint/tendermint/rpc/core/types" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + rpchttp "github.com/KYVENetwork/cometbft/v034x/rpc/client/http" + rpctypes "github.com/KYVENetwork/cometbft/v034x/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/types" ) func init() { diff --git a/test/e2e/tests/evidence_test.go b/test/e2e/tests/evidence_test.go index ea24b51e5cf..6d51e37fef7 100644 --- a/test/e2e/tests/evidence_test.go +++ b/test/e2e/tests/evidence_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - e2e "github.com/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/types" ) // assert that all nodes that have blocks at the height of a misbehavior has evidence diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go index 1ca43fa0556..31275f12846 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/tendermint/tendermint/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v034x/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 847a8d388c8..e4f8f5cc287 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/tendermint/tendermint/test/e2e/pkg" - "github.com/tendermint/tendermint/types" + e2e "github.com/KYVENetwork/cometbft/v034x/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v034x/types" ) // Tests that validator sets are available and correct according to diff --git a/test/fuzz/mempool/v0/checktx.go b/test/fuzz/mempool/v0/checktx.go index 1d70be9bed9..a2da00e1de9 100644 --- a/test/fuzz/mempool/v0/checktx.go +++ b/test/fuzz/mempool/v0/checktx.go @@ -1,11 +1,11 @@ package v0 import ( - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/config" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - "github.com/tendermint/tendermint/proxy" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/config" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + "github.com/KYVENetwork/cometbft/v034x/proxy" ) var mempool mempl.Mempool diff --git a/test/fuzz/mempool/v0/fuzz_test.go b/test/fuzz/mempool/v0/fuzz_test.go index d371ee3ff07..c1e89ed9ead 100644 --- a/test/fuzz/mempool/v0/fuzz_test.go +++ b/test/fuzz/mempool/v0/fuzz_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - mempoolv0 "github.com/tendermint/tendermint/test/fuzz/mempool/v0" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/test/fuzz/mempool/v0" ) const testdataCasesDir = "testdata/cases" diff --git a/test/fuzz/mempool/v1/checktx.go b/test/fuzz/mempool/v1/checktx.go index 5d05ae7b38f..e2e081cccb1 100644 --- a/test/fuzz/mempool/v1/checktx.go +++ b/test/fuzz/mempool/v1/checktx.go @@ -1,13 +1,13 @@ package v1 import ( - "github.com/tendermint/tendermint/abci/example/kvstore" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/log" - mempl "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/proxy" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + "github.com/KYVENetwork/cometbft/v034x/proxy" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" ) var mempool mempl.Mempool diff --git a/test/fuzz/mempool/v1/fuzz_test.go b/test/fuzz/mempool/v1/fuzz_test.go index 000f6df3cb0..4593cc631d1 100644 --- a/test/fuzz/mempool/v1/fuzz_test.go +++ b/test/fuzz/mempool/v1/fuzz_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - mempoolv1 "github.com/tendermint/tendermint/test/fuzz/mempool/v1" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/test/fuzz/mempool/v1" ) const testdataCasesDir = "testdata/cases" diff --git a/test/fuzz/p2p/addrbook/fuzz.go b/test/fuzz/p2p/addrbook/fuzz.go index a7751c22469..3b88fa2c463 100644 --- a/test/fuzz/p2p/addrbook/fuzz.go +++ b/test/fuzz/p2p/addrbook/fuzz.go @@ -5,8 +5,8 @@ import ( "fmt" "math/rand" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/pex" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/pex" ) var addrBook = pex.NewAddrBook("./testdata/addrbook.json", true) diff --git a/test/fuzz/p2p/addrbook/init-corpus/main.go b/test/fuzz/p2p/addrbook/init-corpus/main.go index b0623b298f2..fac042a3e63 100644 --- a/test/fuzz/p2p/addrbook/init-corpus/main.go +++ b/test/fuzz/p2p/addrbook/init-corpus/main.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/p2p" ) func main() { diff --git a/test/fuzz/p2p/pex/init-corpus/main.go b/test/fuzz/p2p/pex/init-corpus/main.go index dfa18363efc..fddce3ad7b3 100644 --- a/test/fuzz/p2p/pex/init-corpus/main.go +++ b/test/fuzz/p2p/pex/init-corpus/main.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/p2p" - tmp2p "github.com/tendermint/tendermint/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/p2p" + tmp2p "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/p2p" ) func main() { diff --git a/test/fuzz/p2p/pex/reactor_receive.go b/test/fuzz/p2p/pex/reactor_receive.go index be9c6bba0f2..5e6de87f0bb 100644 --- a/test/fuzz/p2p/pex/reactor_receive.go +++ b/test/fuzz/p2p/pex/reactor_receive.go @@ -3,13 +3,13 @@ package pex import ( "net" - "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/pex" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/pex" + "github.com/KYVENetwork/cometbft/v034x/version" ) var ( diff --git a/test/fuzz/p2p/secret_connection/read_write.go b/test/fuzz/p2p/secret_connection/read_write.go index 632790002e8..2638e1cfabe 100644 --- a/test/fuzz/p2p/secret_connection/read_write.go +++ b/test/fuzz/p2p/secret_connection/read_write.go @@ -6,9 +6,9 @@ import ( "io" "log" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/libs/async" - sc "github.com/tendermint/tendermint/p2p/conn" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/libs/async" + sc "github.com/KYVENetwork/cometbft/v034x/p2p/conn" ) func Fuzz(data []byte) int { diff --git a/test/fuzz/rpc/jsonrpc/server/handler.go b/test/fuzz/rpc/jsonrpc/server/handler.go index 8189bcccc6b..7094abdc1fe 100644 --- a/test/fuzz/rpc/jsonrpc/server/handler.go +++ b/test/fuzz/rpc/jsonrpc/server/handler.go @@ -7,9 +7,9 @@ import ( "net/http" "net/http/httptest" - "github.com/tendermint/tendermint/libs/log" - rs "github.com/tendermint/tendermint/rpc/jsonrpc/server" - types "github.com/tendermint/tendermint/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + rs "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + types "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/types" ) var rpcFuncMap = map[string]*rs.RPCFunc{ diff --git a/test/loadtime/cmd/load/main.go b/test/loadtime/cmd/load/main.go index a0dba8ece95..1db9756330d 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/tendermint/tendermint/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v034x/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 cc719854972..59be7b10f6b 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/tendermint/tendermint/store" - "github.com/tendermint/tendermint/test/loadtime/report" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/report" ) var ( diff --git a/test/loadtime/payload/payload.proto b/test/loadtime/payload/payload.proto index 19075ba5123..8cb3950c428 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/tendermint/tendermint/test/loadtime/payload"; +option go_package = "github.com/KYVENetwork/cometbft/v034x/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 404144e9ff5..0624b4abd7e 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/tendermint/tendermint/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/payload" ) const payloadSizeTarget = 1024 // 1kb diff --git a/test/loadtime/report/report.go b/test/loadtime/report/report.go index 3fc8ba48851..37ab3521228 100644 --- a/test/loadtime/report/report.go +++ b/test/loadtime/report/report.go @@ -8,8 +8,8 @@ import ( "github.com/gofrs/uuid" "gonum.org/v1/gonum/stat" - "github.com/tendermint/tendermint/test/loadtime/payload" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v034x/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 ed21c63fba5..58b322b2aa3 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/tendermint/tendermint/test/loadtime/payload" - "github.com/tendermint/tendermint/test/loadtime/report" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v034x/test/loadtime/report" + "github.com/KYVENetwork/cometbft/v034x/types" ) type mockBlockStore struct { diff --git a/test/maverick/consensus/misbehavior.go b/test/maverick/consensus/misbehavior.go index 96905a55850..a0dd1fc8a99 100644 --- a/test/maverick/consensus/misbehavior.go +++ b/test/maverick/consensus/misbehavior.go @@ -3,13 +3,13 @@ package consensus import ( "fmt" - cmtcon "github.com/tendermint/tendermint/consensus" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // MisbehaviorList encompasses a list of all possible behaviors diff --git a/test/maverick/consensus/msgs.go b/test/maverick/consensus/msgs.go index d0e6e2b3a13..a8537c3b71e 100644 --- a/test/maverick/consensus/msgs.go +++ b/test/maverick/consensus/msgs.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - cmtcon "github.com/tendermint/tendermint/consensus" - cstypes "github.com/tendermint/tendermint/consensus/types" - cmtmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) func WALToProto(msg cmtcon.WALMessage) (*cmtcons.WALMessage, error) { diff --git a/test/maverick/consensus/reactor.go b/test/maverick/consensus/reactor.go index e59ecaa79b8..7cfd7ba1fd0 100644 --- a/test/maverick/consensus/reactor.go +++ b/test/maverick/consensus/reactor.go @@ -9,19 +9,19 @@ import ( "github.com/gogo/protobuf/proto" - cmtcon "github.com/tendermint/tendermint/consensus" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/libs/bits" - cmtevents "github.com/tendermint/tendermint/libs/events" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtsync "github.com/tendermint/tendermint/libs/sync" - "github.com/tendermint/tendermint/p2p" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtevents "github.com/KYVENetwork/cometbft/v034x/libs/events" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const ( @@ -1472,13 +1472,13 @@ func (ps *PeerState) StringIndented(indent string) string { //----------------------------------------------------------------------------- // 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/NewRoundStepMessage") +// cmtjson.RegisterType(&NewValidBlockMessage{}, "cometbft/NewValidBlockMessage") +// cmtjson.RegisterType(&ProposalMessage{}, "cometbft/Proposal") +// cmtjson.RegisterType(&ProposalPOLMessage{}, "cometbft/ProposalPOL") +// cmtjson.RegisterType(&BlockPartMessage{}, "cometbft/BlockPart") +// cmtjson.RegisterType(&VoteMessage{}, "cometbft/Vote") +// cmtjson.RegisterType(&HasVoteMessage{}, "cometbft/HasVote") +// cmtjson.RegisterType(&VoteSetMaj23Message{}, "cometbft/VoteSetMaj23") +// cmtjson.RegisterType(&VoteSetBitsMessage{}, "cometbft/VoteSetBits") // } diff --git a/test/maverick/consensus/replay.go b/test/maverick/consensus/replay.go index 339de721c4e..05bef264007 100644 --- a/test/maverick/consensus/replay.go +++ b/test/maverick/consensus/replay.go @@ -8,13 +8,13 @@ import ( "reflect" "time" - abci "github.com/tendermint/tendermint/abci/types" - cmtcon "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" ) var crc32c = crc32.MakeTable(crc32.Castagnoli) diff --git a/test/maverick/consensus/replay_file.go b/test/maverick/consensus/replay_file.go index c9f2b54aa5e..64db6c88d1c 100644 --- a/test/maverick/consensus/replay_file.go +++ b/test/maverick/consensus/replay_file.go @@ -12,14 +12,14 @@ import ( dbm "github.com/cometbft/cometbft-db" - cfg "github.com/tendermint/tendermint/config" - cmtcon "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) const ( diff --git a/test/maverick/consensus/replay_stubs.go b/test/maverick/consensus/replay_stubs.go index 033a797f142..cda271b1375 100644 --- a/test/maverick/consensus/replay_stubs.go +++ b/test/maverick/consensus/replay_stubs.go @@ -1,12 +1,12 @@ package consensus import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/clist" - mempl "github.com/tendermint/tendermint/mempool" - cmtstate "github.com/tendermint/tendermint/proto/tendermint/state" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/clist" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + cmtstate "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/proxy" + "github.com/KYVENetwork/cometbft/v034x/types" ) //----------------------------------------------------------------------------- diff --git a/test/maverick/consensus/state.go b/test/maverick/consensus/state.go index 4e9bde08157..24d43e0db5e 100644 --- a/test/maverick/consensus/state.go +++ b/test/maverick/consensus/state.go @@ -13,22 +13,22 @@ import ( "github.com/gogo/protobuf/proto" - cfg "github.com/tendermint/tendermint/config" - cmtcon "github.com/tendermint/tendermint/consensus" - cstypes "github.com/tendermint/tendermint/consensus/types" - "github.com/tendermint/tendermint/crypto" - cmtevents "github.com/tendermint/tendermint/libs/events" - "github.com/tendermint/tendermint/libs/fail" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/p2p" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + cstypes "github.com/KYVENetwork/cometbft/v034x/consensus/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtevents "github.com/KYVENetwork/cometbft/v034x/libs/events" + "github.com/KYVENetwork/cometbft/v034x/libs/fail" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) // State handles execution of the consensus algorithm. @@ -214,7 +214,7 @@ func (cs *State) handleMsg(mi msgInfo) { // We probably don't want to stop the peer here. The vote does not // necessarily comes from a malicious peer but can be just broadcasted by // a typical peer. - // https://github.com/tendermint/tendermint/issues/1281 + // https://github.com/KYVENetwork/cometbft/v034x/issues/1281 // } // NOTE: the vote is broadcast to peers by the reactor listening @@ -1799,7 +1799,7 @@ func (cs *State) tryAddVote(vote *types.Vote, peerID p2p.ID) (bool, error) { // 1) bad peer OR // 2) not a bad peer? this can also err sometimes with "Unexpected step" OR // 3) tmkms use with multiple validators connecting to a single tmkms instance - // (https://github.com/tendermint/tendermint/issues/3839). + // (https://github.com/KYVENetwork/cometbft/v034x/issues/3839). cs.Logger.Info("Error attempting to add vote", "err", err) return added, ErrAddingVote } @@ -1847,11 +1847,11 @@ func (cs *State) voteTime() time.Time { now := cmttime.Now() minVoteTime := now // 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/tendermint/tendermint/tree/v0.34.x/spec/. + // even if cs.LockedBlock != nil. See https://github.com/KYVENetwork/cometbft/v034x/tree/v0.34.x/spec/. timeIota := time.Duration(cs.state.ConsensusParams.Block.TimeIotaMs) * time.Millisecond if cs.LockedBlock != nil { // See the BFT time spec - // https://github.com/tendermint/tendermint/blob/v0.34.x/spec/consensus/bft-time.md + // https://github.com/KYVENetwork/cometbft/v034x/blob/v0.34.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/test/maverick/consensus/ticker.go b/test/maverick/consensus/ticker.go index fb3571ac867..eb1a8ea096e 100644 --- a/test/maverick/consensus/ticker.go +++ b/test/maverick/consensus/ticker.go @@ -3,8 +3,8 @@ package consensus import ( "time" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) var ( diff --git a/test/maverick/consensus/wal.go b/test/maverick/consensus/wal.go index 2c7ccc2a2e6..83742aef178 100644 --- a/test/maverick/consensus/wal.go +++ b/test/maverick/consensus/wal.go @@ -11,14 +11,14 @@ import ( "github.com/gogo/protobuf/proto" - // cmtjson "github.com/tendermint/tendermint/libs/json" - cmtcon "github.com/tendermint/tendermint/consensus" - auto "github.com/tendermint/tendermint/libs/autofile" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/service" - cmtcons "github.com/tendermint/tendermint/proto/tendermint/consensus" - cmttime "github.com/tendermint/tendermint/types/time" + // cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + auto "github.com/KYVENetwork/cometbft/v034x/libs/autofile" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + cmtcons "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/consensus" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const ( @@ -32,9 +32,9 @@ const ( //-------------------------------------------------------- // types and functions for savings consensus messages // func init() { -// cmtjson.RegisterType(msgInfo{}, "tendermint/wal/MsgInfo") -// cmtjson.RegisterType(timeoutInfo{}, "tendermint/wal/TimeoutInfo") -// cmtjson.RegisterType(cmtcon.EndHeightMessage {}, "tendermint/wal/EndHeightMessage ") +// cmtjson.RegisterType(msgInfo{}, "cometbft/wal/MsgInfo") +// cmtjson.RegisterType(timeoutInfo{}, "cometbft/wal/TimeoutInfo") +// cmtjson.RegisterType(cmtcon.EndHeightMessage {}, "cometbft/wal/EndHeightMessage ") // } // Write ahead logger writes msgs to disk before they are processed. @@ -177,7 +177,7 @@ func (wal *BaseWAL) WriteSync(msg cmtcon.WALMessage) error { } if err := wal.FlushAndSync(); err != nil { - wal.Logger.Error(`WriteSync failed to flush consensus wal. + wal.Logger.Error(`WriteSync failed to flush consensus wal. WARNING: may result in creating alternative proposals / votes for the current height iff the node restarted`, "err", err) return err diff --git a/test/maverick/consensus/wal_generator.go b/test/maverick/consensus/wal_generator.go index 64cd6832826..6d5b4dda9ff 100644 --- a/test/maverick/consensus/wal_generator.go +++ b/test/maverick/consensus/wal_generator.go @@ -11,16 +11,16 @@ import ( db "github.com/cometbft/cometbft-db" - "github.com/tendermint/tendermint/abci/example/kvstore" - cfg "github.com/tendermint/tendermint/config" - cmtcon "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/libs/log" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/store" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/abci/example/kvstore" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + cmtcon "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/store" + "github.com/KYVENetwork/cometbft/v034x/types" ) // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a diff --git a/test/maverick/main.go b/test/maverick/main.go index 50d3e183862..90beb0cfa46 100644 --- a/test/maverick/main.go +++ b/test/maverick/main.go @@ -8,19 +8,19 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cmd "github.com/tendermint/tendermint/cmd/cometbft/commands" - "github.com/tendermint/tendermint/cmd/cometbft/commands/debug" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - cmtflags "github.com/tendermint/tendermint/libs/cli/flags" - "github.com/tendermint/tendermint/libs/log" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/p2p" - cs "github.com/tendermint/tendermint/test/maverick/consensus" - nd "github.com/tendermint/tendermint/test/maverick/node" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cmd "github.com/KYVENetwork/cometbft/v034x/cmd/cometbft/commands" + "github.com/KYVENetwork/cometbft/v034x/cmd/cometbft/commands/debug" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/libs/cli" + cmtflags "github.com/KYVENetwork/cometbft/v034x/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/p2p" + cs "github.com/KYVENetwork/cometbft/v034x/test/maverick/consensus" + nd "github.com/KYVENetwork/cometbft/v034x/test/maverick/node" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var ( diff --git a/test/maverick/node/node.go b/test/maverick/node/node.go index 1d60506866a..9f12a2600b7 100644 --- a/test/maverick/node/node.go +++ b/test/maverick/node/node.go @@ -18,42 +18,42 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/tendermint/tendermint/abci/types" - bcv0 "github.com/tendermint/tendermint/blockchain/v0" - bcv1 "github.com/tendermint/tendermint/blockchain/v1" - bcv2 "github.com/tendermint/tendermint/blockchain/v2" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/consensus" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/evidence" - cmtjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/service" - "github.com/tendermint/tendermint/light" - mempl "github.com/tendermint/tendermint/mempool" - mempoolv0 "github.com/tendermint/tendermint/mempool/v0" - mempoolv1 "github.com/tendermint/tendermint/mempool/v1" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/p2p/pex" - "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - rpccore "github.com/tendermint/tendermint/rpc/core" - grpccore "github.com/tendermint/tendermint/rpc/grpc" - rpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" - sm "github.com/tendermint/tendermint/state" - "github.com/tendermint/tendermint/state/indexer" - blockidxkv "github.com/tendermint/tendermint/state/indexer/block/kv" - blockidxnull "github.com/tendermint/tendermint/state/indexer/block/null" - "github.com/tendermint/tendermint/state/txindex" - "github.com/tendermint/tendermint/state/txindex/kv" - "github.com/tendermint/tendermint/state/txindex/null" - "github.com/tendermint/tendermint/statesync" - "github.com/tendermint/tendermint/store" - cs "github.com/tendermint/tendermint/test/maverick/consensus" - "github.com/tendermint/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + bcv0 "github.com/KYVENetwork/cometbft/v034x/blockchain/v0" + bcv1 "github.com/KYVENetwork/cometbft/v034x/blockchain/v1" + bcv2 "github.com/KYVENetwork/cometbft/v034x/blockchain/v2" + cfg "github.com/KYVENetwork/cometbft/v034x/config" + "github.com/KYVENetwork/cometbft/v034x/consensus" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/evidence" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/service" + "github.com/KYVENetwork/cometbft/v034x/light" + mempl "github.com/KYVENetwork/cometbft/v034x/mempool" + mempoolv0 "github.com/KYVENetwork/cometbft/v034x/mempool/v0" + mempoolv1 "github.com/KYVENetwork/cometbft/v034x/mempool/v1" + "github.com/KYVENetwork/cometbft/v034x/p2p" + "github.com/KYVENetwork/cometbft/v034x/p2p/pex" + "github.com/KYVENetwork/cometbft/v034x/privval" + "github.com/KYVENetwork/cometbft/v034x/proxy" + rpccore "github.com/KYVENetwork/cometbft/v034x/rpc/core" + grpccore "github.com/KYVENetwork/cometbft/v034x/rpc/grpc" + rpcserver "github.com/KYVENetwork/cometbft/v034x/rpc/jsonrpc/server" + sm "github.com/KYVENetwork/cometbft/v034x/state" + "github.com/KYVENetwork/cometbft/v034x/state/indexer" + blockidxkv "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/kv" + blockidxnull "github.com/KYVENetwork/cometbft/v034x/state/indexer/block/null" + "github.com/KYVENetwork/cometbft/v034x/state/txindex" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v034x/state/txindex/null" + "github.com/KYVENetwork/cometbft/v034x/statesync" + "github.com/KYVENetwork/cometbft/v034x/store" + cs "github.com/KYVENetwork/cometbft/v034x/test/maverick/consensus" + "github.com/KYVENetwork/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" ) //------------------------------------------------------------------------------ @@ -164,7 +164,7 @@ func DefaultMetricsProvider(config *cfg.InstrumentationConfig) MetricsProvider { type Option func(*Node) // Temporary interface for switching to fast sync, we should get rid of v0 and v1 reactors. -// See: https://github.com/tendermint/tendermint/issues/4595 +// See: https://github.com/KYVENetwork/cometbft/v034x/issues/4595 type fastSyncReactor interface { SwitchToFastSync(sm.State) error } @@ -650,7 +650,7 @@ func createPEXReactorAndAddToSwitch(addrBook pex.AddrBook, config *cfg.Config, // blocks assuming 10s blocks ~ 28 hours. // TODO (melekes): make it dynamic based on the actual block latencies // from the live network. - // https://github.com/tendermint/tendermint/issues/3523 + // https://github.com/KYVENetwork/cometbft/v034x/issues/3523 SeedDisconnectWaitPeriod: 28 * time.Hour, PersistentPeersMaxDialPeriod: config.P2P.PersistentPeersMaxDialPeriod, }) @@ -848,7 +848,7 @@ func NewNode(config *cfg.Config, // Set up state sync reactor, and schedule a sync if requested. // FIXME The way we do phased startups (e.g. replay -> fast sync -> consensus) is very messy, // we should clean this whole thing up. See: - // https://github.com/tendermint/tendermint/issues/4644 + // https://github.com/KYVENetwork/cometbft/v034x/issues/4644 stateSyncReactor := statesync.NewReactor( *config.StateSync, proxyApp.Snapshot(), @@ -1113,7 +1113,7 @@ func (n *Node) startRPC() ([]net.Listener, error) { config.MaxOpenConnections = n.config.RPC.MaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if config.WriteTimeout <= n.config.RPC.TimeoutBroadcastTxCommit { config.WriteTimeout = n.config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } @@ -1192,7 +1192,7 @@ func (n *Node) startRPC() ([]net.Listener, error) { config.MaxOpenConnections = n.config.RPC.GRPCMaxOpenConnections // If necessary adjust global WriteTimeout to ensure it's greater than // TimeoutBroadcastTxCommit. - // See https://github.com/tendermint/tendermint/issues/3435 + // See https://github.com/KYVENetwork/cometbft/v034x/issues/3435 if config.WriteTimeout <= n.config.RPC.TimeoutBroadcastTxCommit { config.WriteTimeout = n.config.RPC.TimeoutBroadcastTxCommit + 1*time.Second } diff --git a/test/maverick/node/privval.go b/test/maverick/node/privval.go index 094b164fd46..60303de1a56 100644 --- a/test/maverick/node/privval.go +++ b/test/maverick/node/privval.go @@ -5,14 +5,14 @@ import ( "fmt" "os" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/libs/tempfile" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + "github.com/KYVENetwork/cometbft/v034x/libs/tempfile" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/types" ) // ******************************************************************************************************************* diff --git a/types/block.go b/types/block.go index dff8d4ab590..338127e4395 100644 --- a/types/block.go +++ b/types/block.go @@ -4,22 +4,22 @@ import ( "bytes" "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" "strings" "time" "github.com/gogo/protobuf/proto" gogotypes "github.com/gogo/protobuf/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/bits" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtsync "github.com/tendermint/tendermint/libs/sync" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) const ( @@ -321,7 +321,7 @@ func MaxDataBytesNoEvidence(maxBytes int64, valsCount int) int64 { // NOTE: changes to the Header should be duplicated in: // - header.Hash() // - abci.Header -// - https://github.com/tendermint/tendermint/blob/v0.34.x/spec/blockchain/blockchain.md +// - https://github.com/KYVENetwork/cometbft/v034x/blob/v0.34.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 9684e7becfb..2630f956189 100644 --- a/types/block_meta.go +++ b/types/block_meta.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // BlockMeta contains meta information. diff --git a/types/block_meta_test.go b/types/block_meta_test.go index 08c50b53fe3..880dc15b7a9 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/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func TestBlockMeta_ToProto(t *testing.T) { diff --git a/types/block_test.go b/types/block_test.go index 20722cb624f..3c4d6a5b4fb 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -5,6 +5,7 @@ import ( // number generator here and we can run the tests a bit faster "crypto/rand" "encoding/hex" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "math" "os" "reflect" @@ -15,16 +16,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/bits" - "github.com/tendermint/tendermint/libs/bytes" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - cmttime "github.com/tendermint/tendermint/types/time" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" + "github.com/KYVENetwork/cometbft/v034x/version" ) func TestMain(m *testing.M) { diff --git a/types/canonical.go b/types/canonical.go index 199b4d4414d..0b83cd6eaa7 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -3,8 +3,8 @@ package types import ( "time" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/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 e6cb8c7fd82..21bcdb79d73 100644 --- a/types/canonical_test.go +++ b/types/canonical_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func TestCanonicalizeBlockID(t *testing.T) { diff --git a/types/encoding_helper.go b/types/encoding_helper.go index 630b088ce56..a16a2eb1f8b 100644 --- a/types/encoding_helper.go +++ b/types/encoding_helper.go @@ -3,7 +3,7 @@ package types import ( gogotypes "github.com/gogo/protobuf/types" - "github.com/tendermint/tendermint/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/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 27aff09f186..f61468a7d8f 100644 --- a/types/event_bus.go +++ b/types/event_bus.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - "github.com/tendermint/tendermint/libs/service" + "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + "github.com/KYVENetwork/cometbft/v034x/libs/service" ) const defaultCapacity = 0 diff --git a/types/event_bus_test.go b/types/event_bus_test.go index 3230df75b04..90e5a971259 100644 --- a/types/event_bus_test.go +++ b/types/event_bus_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" - cmtrand "github.com/tendermint/tendermint/libs/rand" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) func TestEventBusPublishEventTx(t *testing.T) { diff --git a/types/events.go b/types/events.go index c1cd72c4f5b..3260b343cf8 100644 --- a/types/events.go +++ b/types/events.go @@ -3,10 +3,10 @@ package types import ( "fmt" - abci "github.com/tendermint/tendermint/abci/types" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtpubsub "github.com/tendermint/tendermint/libs/pubsub" - cmtquery "github.com/tendermint/tendermint/libs/pubsub/query" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtpubsub "github.com/KYVENetwork/cometbft/v034x/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v034x/libs/pubsub/query" ) // Reserved event types (alphabetically sorted). @@ -46,16 +46,16 @@ type TMEventData interface { } func init() { - cmtjson.RegisterType(EventDataNewBlock{}, "tendermint/event/NewBlock") - cmtjson.RegisterType(EventDataNewBlockHeader{}, "tendermint/event/NewBlockHeader") - 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/event/NewBlock") + cmtjson.RegisterType(EventDataNewBlockHeader{}, "cometbft/event/NewBlockHeader") + cmtjson.RegisterType(EventDataNewEvidence{}, "cometbft/event/NewEvidence") + cmtjson.RegisterType(EventDataTx{}, "cometbft/event/Tx") + cmtjson.RegisterType(EventDataRoundState{}, "cometbft/event/RoundState") + cmtjson.RegisterType(EventDataNewRound{}, "cometbft/event/NewRound") + cmtjson.RegisterType(EventDataCompleteProposal{}, "cometbft/event/CompleteProposal") + cmtjson.RegisterType(EventDataVote{}, "cometbft/event/Vote") + cmtjson.RegisterType(EventDataValidatorSetUpdates{}, "cometbft/event/ValidatorSetUpdates") + cmtjson.RegisterType(EventDataString(""), "cometbft/event/ProposalString") } // Most event messages are basic types (a block, a transaction) diff --git a/types/evidence.go b/types/evidence.go index 1d4c0f1567c..57a70c400fe 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -9,12 +9,12 @@ import ( "strings" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // Evidence represents any provable malicious activity by a validator. @@ -318,10 +318,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()) @@ -511,8 +511,8 @@ func EvidenceFromProto(evidence *cmtproto.Evidence) (Evidence, error) { } func init() { - cmtjson.RegisterType(&DuplicateVoteEvidence{}, "tendermint/DuplicateVoteEvidence") - cmtjson.RegisterType(&LightClientAttackEvidence{}, "tendermint/LightClientAttackEvidence") + cmtjson.RegisterType(&DuplicateVoteEvidence{}, "cometbft/DuplicateVoteEvidence") + cmtjson.RegisterType(&LightClientAttackEvidence{}, "cometbft/LightClientAttackEvidence") } //-------------------------------------------- ERRORS -------------------------------------- diff --git a/types/evidence_test.go b/types/evidence_test.go index 8709df96c2d..d3e8f250eb6 100644 --- a/types/evidence_test.go +++ b/types/evidence_test.go @@ -1,6 +1,7 @@ package types import ( + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "math" "testing" "time" @@ -8,12 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/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 8144e3c4539..9d53a91d7df 100644 --- a/types/genesis.go +++ b/types/genesis.go @@ -8,12 +8,12 @@ import ( "os" "time" - "github.com/tendermint/tendermint/crypto" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtos "github.com/tendermint/tendermint/libs/os" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v034x/libs/os" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) const ( diff --git a/types/genesis_test.go b/types/genesis_test.go index 4a8c88d0648..f37b6d1141e 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/tendermint/tendermint/crypto/ed25519" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmttime "github.com/KYVENetwork/cometbft/v034x/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/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/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/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/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="}, "power":"10", "name":"" }], diff --git a/types/light.go b/types/light.go index 5a2a2901e30..2362c351471 100644 --- a/types/light.go +++ b/types/light.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // LightBlock is a SignedHeader and a ValidatorSet. diff --git a/types/light_test.go b/types/light_test.go index af5f60de5c9..6eac554b69d 100644 --- a/types/light_test.go +++ b/types/light_test.go @@ -1,15 +1,15 @@ package types import ( + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/v034x/version" "math" "testing" "time" "github.com/stretchr/testify/assert" - "github.com/tendermint/tendermint/crypto" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/version" ) func TestLightBlockValidateBasic(t *testing.T) { diff --git a/types/params.go b/types/params.go index 2fc704f115b..80faf601607 100644 --- a/types/params.go +++ b/types/params.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const ( diff --git a/types/params_test.go b/types/params_test.go index a47eb871e1e..c3d933d1e54 100644 --- a/types/params_test.go +++ b/types/params_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - abci "github.com/tendermint/tendermint/abci/types" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) var ( diff --git a/types/part_set.go b/types/part_set.go index 4b1422789c4..9943c892013 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -6,13 +6,13 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/libs/bits" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtsync "github.com/tendermint/tendermint/libs/sync" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) var ( diff --git a/types/part_set_test.go b/types/part_set_test.go index fa723ddec3b..3c1222f111f 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/tendermint/tendermint/crypto/merkle" - cmtrand "github.com/tendermint/tendermint/libs/rand" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" ) const ( diff --git a/types/priv_validator.go b/types/priv_validator.go index ad7259bdbf6..4a141cf01fe 100644 --- a/types/priv_validator.go +++ b/types/priv_validator.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // PrivValidator defines the functionality of a local CometBFT validator diff --git a/types/proposal.go b/types/proposal.go index 3401f6f055a..b45eb3db915 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/protoio" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) var ( diff --git a/types/proposal_test.go b/types/proposal_test.go index 505cec7862a..c955eedec83 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/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/protoio" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) var ( diff --git a/types/protobuf.go b/types/protobuf.go index 489529c541b..f8a8713eb9d 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -1,12 +1,12 @@ package types import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - "github.com/tendermint/tendermint/crypto/secp256k1" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + "github.com/KYVENetwork/cometbft/v034x/crypto/secp256k1" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) //------------------------------------------------------- diff --git a/types/protobuf_test.go b/types/protobuf_test.go index c617751e4ee..d5ae79dd194 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/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" ) func TestABCIPubKey(t *testing.T) { diff --git a/types/results.go b/types/results.go index 9181450bc84..1ca8d06e6d9 100644 --- a/types/results.go +++ b/types/results.go @@ -1,8 +1,8 @@ package types import ( - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/merkle" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" + "github.com/KYVENetwork/cometbft/v034x/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 5b1be3466bc..0925353fb4a 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/tendermint/tendermint/abci/types" + abci "github.com/KYVENetwork/cometbft/v034x/abci/types" ) func TestABCIResults(t *testing.T) { diff --git a/types/signable.go b/types/signable.go index 1de5352baf5..0b306586bc3 100644 --- a/types/signable.go +++ b/types/signable.go @@ -1,8 +1,8 @@ package types import ( - "github.com/tendermint/tendermint/crypto/ed25519" - cmtmath "github.com/tendermint/tendermint/libs/math" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" ) var ( diff --git a/types/signed_msg_type.go b/types/signed_msg_type.go index de9f6fc3387..87fc5940fd6 100644 --- a/types/signed_msg_type.go +++ b/types/signed_msg_type.go @@ -1,6 +1,6 @@ package types -import cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" +import cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/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 51e321cdb2e..6babc680634 100644 --- a/types/test_util.go +++ b/types/test_util.go @@ -2,11 +2,11 @@ package types import ( "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/version" "time" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmtversion "github.com/tendermint/tendermint/proto/tendermint/version" - "github.com/tendermint/tendermint/version" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + "github.com/KYVENetwork/cometbft/v034x/version" ) func MakeCommit(blockID BlockID, height int64, round int32, diff --git a/types/time/time.go b/types/time/time.go index 022bdf574f8..a3f26d1491c 100644 --- a/types/time/time.go +++ b/types/time/time.go @@ -12,7 +12,7 @@ func Now() time.Time { // Canonical returns UTC time with no monotonic component. // Stripping the monotonic component is for time equality. -// See https://github.com/tendermint/tendermint/pull/2203#discussion_r215064334 +// See https://github.com/KYVENetwork/cometbft/v034x/pull/2203#discussion_r215064334 func Canonical(t time.Time) time.Time { return t.Round(0).UTC() } diff --git a/types/tx.go b/types/tx.go index ddb59dfe5d0..979151efa36 100644 --- a/types/tx.go +++ b/types/tx.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/crypto/tmhash" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // TxKeySize is the size of the transaction key index diff --git a/types/tx_test.go b/types/tx_test.go index 63624899dd3..10a70f8d09d 100644 --- a/types/tx_test.go +++ b/types/tx_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/tendermint/tendermint/libs/rand" - ctest "github.com/tendermint/tendermint/libs/test" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + ctest "github.com/KYVENetwork/cometbft/v034x/libs/test" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func makeTxs(cnt, size int) Txs { diff --git a/types/validation.go b/types/validation.go index cdb72c48ce8..193e3ee5284 100644 --- a/types/validation.go +++ b/types/validation.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto/tmhash" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) // ValidateTime does a basic time validation ensuring time does not drift too diff --git a/types/validator.go b/types/validator.go index 2704bb2be55..fd74d1563b2 100644 --- a/types/validator.go +++ b/types/validator.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/crypto" - ce "github.com/tendermint/tendermint/crypto/encoding" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + ce "github.com/KYVENetwork/cometbft/v034x/crypto/encoding" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) // Volatile state for each Validator diff --git a/types/validator_set.go b/types/validator_set.go index 9b072217c84..d95a5ff5fcf 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -9,9 +9,9 @@ import ( "sort" "strings" - "github.com/tendermint/tendermint/crypto/merkle" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto/merkle" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const ( diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 90b521a6bc3..01627e3a3bf 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - cmtmath "github.com/tendermint/tendermint/libs/math" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + cmtmath "github.com/KYVENetwork/cometbft/v034x/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func TestValidatorSetBasic(t *testing.T) { diff --git a/types/vote.go b/types/vote.go index 544ae47b583..65602632ecd 100644 --- a/types/vote.go +++ b/types/vote.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto" - cmtbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/protoio" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtbytes "github.com/KYVENetwork/cometbft/v034x/libs/bytes" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const ( diff --git a/types/vote_set.go b/types/vote_set.go index 277a3e47234..cacf3726ac3 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/libs/bits" - cmtjson "github.com/tendermint/tendermint/libs/json" - cmtsync "github.com/tendermint/tendermint/libs/sync" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/libs/bits" + cmtjson "github.com/KYVENetwork/cometbft/v034x/libs/json" + cmtsync "github.com/KYVENetwork/cometbft/v034x/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) const ( diff --git a/types/vote_set_test.go b/types/vote_set_test.go index d2a115903c5..1dff309c8af 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/tendermint/tendermint/crypto" - cmtrand "github.com/tendermint/tendermint/libs/rand" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" - cmttime "github.com/tendermint/tendermint/types/time" + "github.com/KYVENetwork/cometbft/v034x/crypto" + cmtrand "github.com/KYVENetwork/cometbft/v034x/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" + cmttime "github.com/KYVENetwork/cometbft/v034x/types/time" ) func TestVoteSet_AddVote_Good(t *testing.T) { diff --git a/types/vote_test.go b/types/vote_test.go index 6d3a8c720d2..5015af8ca28 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/protoio" - cmtproto "github.com/tendermint/tendermint/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v034x/crypto" + "github.com/KYVENetwork/cometbft/v034x/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v034x/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v034x/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v034x/proto/cometbft/v034x/types" ) func examplePrevote() *Vote {