fix: fix buf unexisting repo (cosmos#13343)

Makefile

@@ -430,34 +430,18 @@ proto-lint:
 proto-check-breaking:
  @$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
 
-
 TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.21/proto/tendermint
-GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/v1.3.3-alpha.regen.1
-COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/v0.3.1
-CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/go/v0.7.0
-
-TM_CRYPTO_TYPES = third_party/proto/tendermint/crypto
-TM_ABCI_TYPES = third_party/proto/tendermint/abci
-TM_TYPES = third_party/proto/tendermint/types
-TM_VERSION = third_party/proto/tendermint/version
-TM_LIBS = third_party/proto/tendermint/libs/bits
-TM_P2P = third_party/proto/tendermint/p2p
 
-GOGO_PROTO_TYPES = third_party/proto/gogoproto
-COSMOS_PROTO_TYPES = third_party/proto/cosmos_proto
-CONFIO_TYPES = third_party/proto/confio
+TM_CRYPTO_TYPES = proto/tendermint/crypto
+TM_ABCI_TYPES = proto/tendermint/abci
+TM_TYPES = proto/tendermint/types
+TM_VERSION = proto/tendermint/version
+TM_LIBS = proto/tendermint/libs/bits
+TM_P2P = proto/tendermint/p2p
 
 proto-update-deps:
- @mkdir -p $(GOGO_PROTO_TYPES)
- @curl -sSL $(GOGO_PROTO_URL)/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
+ @echo "Updating Protobuf dependencies"
 
- @mkdir -p $(COSMOS_PROTO_TYPES)
- @curl -sSL $(COSMOS_PROTO_URL)/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto
-
-## Importing of tendermint protobuf definitions currently requires the
-## use of `sed` in order to build properly with cosmos-sdk's proto file layout
-## (which is the standard Buf.build FILE_LAYOUT)
-## Issue link: https://github.com/tendermint/tendermint/issues/5021
  @mkdir -p $(TM_ABCI_TYPES)
  @curl -sSL $(TM_URL)/abci/types.proto > $(TM_ABCI_TYPES)/types.proto
 
@@ -481,12 +465,6 @@ proto-update-deps:
  @mkdir -p $(TM_P2P)
  @curl -sSL $(TM_URL)/p2p/types.proto > $(TM_P2P)/types.proto
 
- @mkdir -p $(CONFIO_TYPES)
- @curl -sSL $(CONFIO_URL)/proofs.proto > $(CONFIO_TYPES)/proofs.proto
-## insert go package option into proofs.proto file
-## Issue link: https://github.com/confio/ics23/issues/32
- @sed -i '4ioption go_package = "github.com/confio/ics23/go";' $(CONFIO_TYPES)/proofs.proto
-
 .PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking proto-update-deps
 
 ###############################################################################

client/v2/internal/buf.lock

@@ -4,20 +4,16 @@ deps:
  - remote: buf.build
  owner: cosmos
  repository: cosmos-proto
- branch: main
  commit: 1935555c206d4afb9e94615dfd0fad31
  - remote: buf.build
  owner: cosmos
  repository: cosmos-sdk
- branch: main
  commit: 86d2a697b026488089f13a71ceb3815c
  - remote: buf.build
  owner: cosmos
  repository: gogo-proto
- branch: main
  commit: bee5511075b7499da6178d9e4aaa628b
  - remote: buf.build
  owner: googleapis
  repository: googleapis
- branch: main
- commit: 40f07f5b563941f2b20b991a7aedd53d
+ commit: 62f35d8aed1149c291d606d958a7ce32

proto/buf.lock

@@ -4,21 +4,12 @@ deps:
  - remote: buf.build
  owner: cosmos
  repository: cosmos-proto
- branch: main
  commit: 1935555c206d4afb9e94615dfd0fad31
- digest: b1-TNqW6xj2Pjha5Uoj9a-5uOeRo4mwswKfyqMcN3I_gZ0=
- create_time: 2021-12-02T22:04:00.31049Z
  - remote: buf.build
  owner: cosmos
  repository: gogo-proto
- branch: main
  commit: bee5511075b7499da6178d9e4aaa628b
- digest: b1-rrBIustouD-S80cVoZ_rM0qJsmei9AgbXy9GPQu6vxg=
- create_time: 2021-12-02T20:01:17.069307Z
  - remote: buf.build
  owner: googleapis
  repository: googleapis
- branch: main
- commit: 40f07f5b563941f2b20b991a7aedd53d
- digest: b1-Iv8fTR4AKXwNW80Ey6K5tY8cP053y_95sB5fro9IWZo=
- create_time: 2021-12-02T15:07:41.896892Z
+ commit: 8d7204855ec14631a499bd7393ce1970

proto/tendermint/abci/types.proto

@@ -58,12 +58,13 @@ message RequestSetOption {
 }
 
 message RequestInitChain {
- google.protobuf.Timestamp time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
- string chain_id = 2;
- ConsensusParams consensus_params = 3;
- repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false];
- bytes app_state_bytes = 5;
- int64 initial_height = 6;
+ google.protobuf.Timestamp time = 1
+ [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+ string chain_id = 2;
+ ConsensusParams consensus_params = 3;
+ repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false];
+ bytes app_state_bytes = 5;
+ int64 initial_height = 6;
 }
 
 message RequestQuery {
@@ -105,8 +106,8 @@ message RequestListSnapshots {}
 
 // offers a snapshot to the application
 message RequestOfferSnapshot {
- Snapshot snapshot = 1; // snapshot offered by peers
- bytes app_hash = 2; // light client-verified app hash for snapshot height
+ Snapshot snapshot = 1;  // snapshot offered by peers
+ bytes app_hash = 2;  // light client-verified app hash for snapshot height
 }
 
 // loads a snapshot chunk
@@ -185,8 +186,8 @@ message ResponseInitChain {
 message ResponseQuery {
  uint32 code = 1;
  // bytes data = 2; // use "value" instead.
- string log = 3; // nondeterministic
- string info = 4; // nondeterministic
+ string log = 3;  // nondeterministic
+ string info = 4;  // nondeterministic
  int64 index = 5;
  bytes key = 6;
  bytes value = 7;
@@ -196,35 +197,47 @@ message ResponseQuery {
 }
 
 message ResponseBeginBlock {
- repeated Event events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
+ repeated Event events = 1
+ [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
 }
 
 message ResponseCheckTx {
  uint32 code = 1;
  bytes data = 2;
- string log = 3; // nondeterministic
- string info = 4; // nondeterministic
+ string log = 3;  // nondeterministic
+ string info = 4;  // nondeterministic
  int64 gas_wanted = 5 [json_name = "gas_wanted"];
  int64 gas_used = 6 [json_name = "gas_used"];
- repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
- string codespace = 8;
+ repeated Event events = 7
+ [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
+ string codespace = 8;
+ string sender = 9;
+ int64 priority = 10;
+
+ // mempool_error is set by Tendermint.
+ // ABCI applictions creating a ResponseCheckTX should not set mempool_error.
+ string mempool_error = 11;
 }
 
 message ResponseDeliverTx {
  uint32 code = 1;
  bytes data = 2;
- string log = 3; // nondeterministic
- string info = 4; // nondeterministic
+ string log = 3;  // nondeterministic
+ string info = 4;  // nondeterministic
  int64 gas_wanted = 5 [json_name = "gas_wanted"];
  int64 gas_used = 6 [json_name = "gas_used"];
- repeated Event events = 7 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
- string codespace = 8;
+ repeated Event events = 7 [
+ (gogoproto.nullable) = false,
+ (gogoproto.jsontag) = "events,omitempty"
+ ]; // nondeterministic
+ string codespace = 8;
 }
 
 message ResponseEndBlock {
  repeated ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false];
  ConsensusParams consensus_param_updates = 2;
- repeated Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
+ repeated Event events = 3
+ [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"];
 }
 
 message ResponseCommit {
@@ -241,12 +254,12 @@ message ResponseOfferSnapshot {
  Result result = 1;
 
  enum Result {
- UNKNOWN = 0; // Unknown result, abort all snapshot restoration
- ACCEPT = 1; // Snapshot accepted, apply chunks
- ABORT = 2; // Abort all snapshot restoration
- REJECT = 3; // Reject this specific snapshot, try others
- REJECT_FORMAT = 4; // Reject all snapshots of this format, try others
- REJECT_SENDER = 5; // Reject all snapshots from the sender(s), try others
+ UNKNOWN = 0;  // Unknown result, abort all snapshot restoration
+ ACCEPT = 1;  // Snapshot accepted, apply chunks
+ ABORT = 2;  // Abort all snapshot restoration
+ REJECT = 3;  // Reject this specific snapshot, try others
+ REJECT_FORMAT = 4;  // Reject all snapshots of this format, try others
+ REJECT_SENDER = 5;  // Reject all snapshots from the sender(s), try others
  }
 }
 
@@ -256,16 +269,16 @@ message ResponseLoadSnapshotChunk {
 
 message ResponseApplySnapshotChunk {
  Result result = 1;
- repeated uint32 refetch_chunks = 2; // Chunks to refetch and reapply
- repeated string reject_senders = 3; // Chunk senders to reject and ban
+ repeated uint32 refetch_chunks = 2;  // Chunks to refetch and reapply
+ repeated string reject_senders = 3;  // Chunk senders to reject and ban
 
  enum Result {
- UNKNOWN = 0; // Unknown result, abort all snapshot restoration
- ACCEPT = 1; // Chunk successfully accepted
- ABORT = 2; // Abort all snapshot restoration
- RETRY = 3; // Retry chunk (combine with refetch and reject)
- RETRY_SNAPSHOT = 4; // Retry snapshot (combine with refetch and reject)
- REJECT_SNAPSHOT = 5; // Reject this snapshot, try others
+ UNKNOWN = 0;  // Unknown result, abort all snapshot restoration
+ ACCEPT = 1;  // Chunk successfully accepted
+ ABORT = 2;  // Abort all snapshot restoration
+ RETRY = 3;  // Retry chunk (combine with refetch and reject)
+ RETRY_SNAPSHOT = 4;  // Retry snapshot (combine with refetch and reject)
+ REJECT_SNAPSHOT = 5;  // Reject this snapshot, try others
  }
 }
 
@@ -299,14 +312,17 @@ message LastCommitInfo {
 // Later, transactions may be queried using these events.
 message Event {
  string type = 1;
- repeated EventAttribute attributes = 2 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "attributes,omitempty"];
+ repeated EventAttribute attributes = 2 [
+ (gogoproto.nullable) = false,
+ (gogoproto.jsontag) = "attributes,omitempty"
+ ];
 }
 
 // EventAttribute is a single key-value pair, associated with an event.
 message EventAttribute {
  bytes key = 1;
  bytes value = 2;
- bool index = 3; // nondeterministic
+ bool index = 3;  // nondeterministic
 }
 
 // TxResult contains results of executing the transaction.
@@ -324,9 +340,9 @@ message TxResult {
 
 // Validator
 message Validator {
- bytes address = 1; // The first 20 bytes of SHA256(public key)
+ bytes address = 1;  // The first 20 bytes of SHA256(public key)
  // PubKey pub_key = 2 [(gogoproto.nullable)=false];
- int64 power = 3; // The voting power
+ int64 power = 3;  // The voting power
 }
 
 // ValidatorUpdate
@@ -354,7 +370,8 @@ message Evidence {
  // The height when the offense occurred
  int64 height = 3;
  // The corresponding time where the offense occurred
- google.protobuf.Timestamp time = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+ google.protobuf.Timestamp time = 4
+ [(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
@@ -365,11 +382,11 @@ message Evidence {
 // State Sync Types
 
 message Snapshot {
- uint64 height = 1; // The height at which the snapshot was taken
- uint32 format = 2; // The application-specific snapshot format
- uint32 chunks = 3; // Number of chunks in the snapshot
- bytes hash = 4; // Arbitrary snapshot hash, equal only if identical
- bytes metadata = 5; // Arbitrary application metadata
+ uint64 height = 1;  // The height at which the snapshot was taken
+ uint32 format = 2;  // The application-specific snapshot format
+ uint32 chunks = 3;  // Number of chunks in the snapshot
+ bytes hash = 4;  // Arbitrary snapshot hash, equal only if identical
+ bytes metadata = 5;  // Arbitrary application metadata
 }
 
 //----------------------------------------
@@ -389,6 +406,8 @@ service ABCIApplication {
  rpc EndBlock(RequestEndBlock) returns (ResponseEndBlock);
  rpc ListSnapshots(RequestListSnapshots) returns (ResponseListSnapshots);
  rpc OfferSnapshot(RequestOfferSnapshot) returns (ResponseOfferSnapshot);
- rpc LoadSnapshotChunk(RequestLoadSnapshotChunk) returns (ResponseLoadSnapshotChunk);
- rpc ApplySnapshotChunk(RequestApplySnapshotChunk) returns (ResponseApplySnapshotChunk);
+ rpc LoadSnapshotChunk(RequestLoadSnapshotChunk)
+ returns (ResponseLoadSnapshotChunk);
+ rpc ApplySnapshotChunk(RequestApplySnapshotChunk)
+ returns (ResponseApplySnapshotChunk);
 }

proto/tendermint/p2p/types.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 package tendermint.p2p;
-option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
+
+option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p";
 
 import "gogoproto/gogo.proto";
 

proto/tendermint/types/evidence.proto

@@ -30,7 +30,7 @@ message LightClientAttackEvidence {
  int64 common_height = 2;
  repeated tendermint.types.Validator byzantine_validators = 3;
  int64 total_voting_power = 4;
- google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+ google.protobuf.Timestamp timestamp  = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
 }
 
 message EvidenceList {

proto/tendermint/types/params.proto

@@ -45,7 +45,8 @@ message EvidenceParams {
  // It should correspond with an app's "unbonding period" or other similar
  // mechanism for handling [Nothing-At-Stake
  // attacks](https://github.com/ethereum/wiki/wiki/Proof-of-Stake-FAQ#what-is-the-nothing-at-stake-problem-and-how-can-it-be-fixed).
- google.protobuf.Duration max_age_duration = 2 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
+ google.protobuf.Duration max_age_duration = 2
+ [(gogoproto.nullable) = false, (gogoproto.stdduration) = true];
 
  // This sets the maximum size of total evidence in bytes that can be committed in a single block.
  // and should fall comfortably under the max block bytes.