@agoric/cosmos 0.35.0-u19.2 → 0.35.0-u21.0

package/proto/agoric/vbank/vbank.proto

@@ -8,67 +8,57 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vbank/types";
 
 // The module governance/configuration parameters.
 message Params {
-    option (gogoproto.equal) = true;
-    option (gogoproto.goproto_stringer) = false;
+  option (gogoproto.equal)            = true;
+  option (gogoproto.goproto_stringer) = false;
 
-    // reward_epoch_duration_blocks is the length of a reward epoch, in blocks.
-    // A value of zero has the same meaning as a value of one:
-    // the full reward buffer should be distributed immediately.
-    int64 reward_epoch_duration_blocks = 1 [
-      (gogoproto.moretags) = "yaml:\"reward_epoch_duration_blocks\""
-    ];
+  // reward_epoch_duration_blocks is the length of a reward epoch, in blocks.
+  // A value of zero has the same meaning as a value of one:
+  // the full reward buffer should be distributed immediately.
+  int64 reward_epoch_duration_blocks = 1 [(gogoproto.moretags) = "yaml:\"reward_epoch_duration_blocks\""];
 
-    // per_epoch_reward_fraction is a fraction of the reward pool to distrubute
-    // once every reward epoch.  If less than zero, use approximately continuous
-    // per-block distribution.
-    string per_epoch_reward_fraction = 2 [
-      (gogoproto.moretags)   = "yaml:\"discrete_epoch_reward_fraction\"",
-      (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-      (gogoproto.nullable)   = false
-    ];
+  // per_epoch_reward_fraction is a fraction of the reward pool to distrubute
+  // once every reward epoch.  If less than zero, use approximately continuous
+  // per-block distribution.
+  string per_epoch_reward_fraction = 2 [
+    (gogoproto.moretags)   = "yaml:\"discrete_epoch_reward_fraction\"",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable)   = false
+  ];
 
-    // reward_smoothing_blocks is the number of blocks over which to distribute
-    // an epoch's rewards.  If zero, use the same value as
-    // reward_epoch_duration_blocks.
-    int64 reward_smoothing_blocks = 3 [
-      (gogoproto.moretags) = "yaml:\"reward_smoothing_blocks\""
-    ];
+  // reward_smoothing_blocks is the number of blocks over which to distribute
+  // an epoch's rewards.  If zero, use the same value as
+  // reward_epoch_duration_blocks.
+  int64 reward_smoothing_blocks = 3 [(gogoproto.moretags) = "yaml:\"reward_smoothing_blocks\""];
 
-    // allowed_monitoring_accounts is an array of account addresses that can be
-    // monitored for sends and receives.  An element of `"*"` will permit any
-    // address.
-    repeated string allowed_monitoring_accounts = 4 [
-      (gogoproto.moretags) = "yaml:\"allowed_monitoring_accounts\""
-    ];
+  // allowed_monitoring_accounts is an array of account addresses that can be
+  // monitored for sends and receives.  An element of `"*"` will permit any
+  // address.
+  repeated string allowed_monitoring_accounts = 4 [(gogoproto.moretags) = "yaml:\"allowed_monitoring_accounts\""];
 }
 
 // The current state of the module.
 message State {
-    option (gogoproto.equal) = true;
+  option (gogoproto.equal) = true;
 
-    // rewardPool is the current balance of rewards in the module account.
-    // NOTE: Tracking manually since there is no bank call for getting a
-    // module account balance by name.
-    repeated cosmos.base.v1beta1.Coin reward_pool = 1 [
-        (gogoproto.nullable) = false,
-        (gogoproto.moretags) = "yaml:\"reward_pool\"",
-        (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-    ];
+  // rewardPool is the current balance of rewards in the module account.
+  // NOTE: Tracking manually since there is no bank call for getting a
+  // module account balance by name.
+  repeated cosmos.base.v1beta1.Coin reward_pool = 1 [
+    (gogoproto.nullable)     = false,
+    (gogoproto.moretags)     = "yaml:\"reward_pool\"",
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
 
-    // reward_block_amount is the amount of reward, if available, to send to the
-    // fee collector module on every block.
-    repeated cosmos.base.v1beta1.Coin reward_block_amount = 2 [
-        (gogoproto.nullable) = false,
-        (gogoproto.moretags) = "yaml:\"reward_block_amount\"",
-        (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
-    ];
-        
-    // last_sequence is a sequence number for communicating with the VM.
-    uint64 last_sequence = 3 [
-        (gogoproto.moretags) = "yaml:\"last_sequence\""
-    ];
+  // reward_block_amount is the amount of reward, if available, to send to the
+  // fee collector module on every block.
+  repeated cosmos.base.v1beta1.Coin reward_block_amount = 2 [
+    (gogoproto.nullable)     = false,
+    (gogoproto.moretags)     = "yaml:\"reward_block_amount\"",
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
+  ];
 
-    int64 last_reward_distribution_block = 4 [
-        (gogoproto.moretags) = "yaml:\"last_reward_distribution_block\""
-    ];
+  // last_sequence is a sequence number for communicating with the VM.
+  uint64 last_sequence = 3 [(gogoproto.moretags) = "yaml:\"last_sequence\""];
+
+  int64 last_reward_distribution_block = 4 [(gogoproto.moretags) = "yaml:\"last_reward_distribution_block\""];
 }

package/proto/agoric/vibc/msgs.proto

@@ -14,18 +14,15 @@ service Msg {
 
 // MsgSendPacket is an SDK message for sending an outgoing IBC packet
 message MsgSendPacket {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    ibc.core.channel.v1.Packet packet = 1 [
-        (gogoproto.nullable)   = false,
-        (gogoproto.jsontag)    = "packet",
-        (gogoproto.moretags)   = "yaml:\"packet\""
-    ];
-    bytes sender = 2 [
-        (gogoproto.casttype)   = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-        (gogoproto.jsontag)    = "submitter",
-        (gogoproto.moretags)   = "yaml:\"submitter\""
-    ];
+  ibc.core.channel.v1.Packet packet = 1
+      [(gogoproto.nullable) = false, (gogoproto.jsontag) = "packet", (gogoproto.moretags) = "yaml:\"packet\""];
+  bytes sender = 2 [
+    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
+    (gogoproto.jsontag)  = "submitter",
+    (gogoproto.moretags) = "yaml:\"submitter\""
+  ];
 }
 
 // Empty response for SendPacket.

package/proto/agoric/vstorage/genesis.proto

@@ -7,19 +7,16 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types
 
 // The initial or exported state.
 message GenesisState {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    repeated DataEntry data = 1 [
-        (gogoproto.jsontag)    = "data",
-        (gogoproto.moretags)   = "yaml:\"data\""
-    ];
+  repeated DataEntry data = 1 [(gogoproto.jsontag) = "data", (gogoproto.moretags) = "yaml:\"data\""];
 }
 
 // A vstorage entry.  The only necessary entries are those with data, as the
 // ancestor nodes are reconstructed on import.
 message DataEntry {
-    // A "."-separated path with individual path elements matching
-    // `[-_A-Za-z0-9]+`
-    string path = 1;
-    string value = 2;
+  // A "."-separated path with individual path elements matching
+  // `[-_A-Za-z0-9]+`
+  string path  = 1;
+  string value = 2;
 }

package/proto/agoric/vstorage/query.proto

@@ -16,95 +16,66 @@ service Query {
 
   // Return a formatted representation of a vstorage datum that must be
   // a valid StreamCell with CapData values, or standalone CapData.
-  rpc CapData(QueryCapDataRequest)
-    returns (QueryCapDataResponse) {
-      option (google.api.http).get = "/agoric/vstorage/capdata/{path}";
+  rpc CapData(QueryCapDataRequest) returns (QueryCapDataResponse) {
+    option (google.api.http).get = "/agoric/vstorage/capdata/{path}";
   }
 
   // Return the children of a given vstorage path.
-  rpc Children(QueryChildrenRequest)
-    returns (QueryChildrenResponse) {
-      option (google.api.http).get = "/agoric/vstorage/children/{path}";
+  rpc Children(QueryChildrenRequest) returns (QueryChildrenResponse) {
+    option (google.api.http).get = "/agoric/vstorage/children/{path}";
   }
 }
 
 // QueryDataRequest is the vstorage path data query.
 message QueryDataRequest {
-  string path = 1 [
-    (gogoproto.jsontag)    = "path",
-    (gogoproto.moretags)   = "yaml:\"path\""
-  ];
+  string path = 1 [(gogoproto.jsontag) = "path", (gogoproto.moretags) = "yaml:\"path\""];
 }
 
 // QueryDataResponse is the vstorage path data response.
 message QueryDataResponse {
-  string value = 1 [
-    (gogoproto.jsontag)    = "value",
-    (gogoproto.moretags)   = "yaml:\"value\""
-  ];
+  string value = 1 [(gogoproto.jsontag) = "value", (gogoproto.moretags) = "yaml:\"value\""];
 }
 
 // QueryCapDataRequest contains a path and formatting configuration.
 message QueryCapDataRequest {
-  string path = 1 [
-    (gogoproto.jsontag)    = "path",
-    (gogoproto.moretags)   = "yaml:\"path\""
-  ];
+  string path = 1 [(gogoproto.jsontag) = "path", (gogoproto.moretags) = "yaml:\"path\""];
   // mediaType must be an actual media type in the registry at
   // https://www.iana.org/assignments/media-types/media-types.xhtml
   // or a special value that does not conflict with the media type syntax.
   // The only valid value is "JSON Lines", which is also the default.
-  string media_type = 2 [
-    (gogoproto.jsontag)    = "mediaType",
-    (gogoproto.moretags)   = "yaml:\"mediaType\""
-  ];
+  string media_type = 2 [(gogoproto.jsontag) = "mediaType", (gogoproto.moretags) = "yaml:\"mediaType\""];
   // itemFormat, if present, must be the special value "flat" to indicate that
   // the deep structure of each item should be flattened into a single level
   // with kebab-case keys (e.g., `{ "metrics": { "min": 0, "max": 88 } }` as
   // `{ "metrics-min": 0, "metrics-max": 88 }`).
-  string item_format = 3 [
-    (gogoproto.jsontag)    = "itemFormat",
-    (gogoproto.moretags)   = "yaml:\"itemFormat\""
-  ];
+  string item_format = 3 [(gogoproto.jsontag) = "itemFormat", (gogoproto.moretags) = "yaml:\"itemFormat\""];
   // remotableValueFormat indicates how to transform references to opaque but
   // distinguishable Remotables into readable embedded representations.
-  // * "object" represents each Remotable as an `{ id, allegedName }` object, e.g. `{ "id": "board007", "allegedName": "IST brand" }`.
-  // * "string" represents each Remotable as a string with bracket-wrapped contents including its alleged name and id, e.g. "[Alleged: IST brand <board007>]".
-  string remotable_value_format = 10 [
-    (gogoproto.jsontag)    = "remotableValueFormat",
-    (gogoproto.moretags)   = "yaml:\"remotableValueFormat\""
-  ];
+  // * "object" represents each Remotable as an `{ id, allegedName }` object, e.g. `{ "id": "board007", "allegedName":
+  // "IST brand" }`.
+  // * "string" represents each Remotable as a string with bracket-wrapped contents including its alleged name and id,
+  // e.g. "[Alleged: IST brand <board007>]".
+  string remotable_value_format = 10
+      [(gogoproto.jsontag) = "remotableValueFormat", (gogoproto.moretags) = "yaml:\"remotableValueFormat\""];
 }
 
 // QueryCapDataResponse represents the result with the requested formatting,
 // reserving space for future metadata such as media type.
 message QueryCapDataResponse {
-  string block_height = 1 [
-    (gogoproto.jsontag)    = "blockHeight",
-    (gogoproto.moretags)   = "yaml:\"blockHeight\""
-  ];
-  string value = 10 [
-    (gogoproto.jsontag)    = "value",
-    (gogoproto.moretags)   = "yaml:\"value\""
-  ];
+  string block_height = 1 [(gogoproto.jsontag) = "blockHeight", (gogoproto.moretags) = "yaml:\"blockHeight\""];
+  string value        = 10 [(gogoproto.jsontag) = "value", (gogoproto.moretags) = "yaml:\"value\""];
 }
 
 // QueryChildrenRequest is the vstorage path children query.
 message QueryChildrenRequest {
-  string path = 1 [
-    (gogoproto.jsontag)    = "path",
-    (gogoproto.moretags)   = "yaml:\"path\""
-  ];
+  string path = 1 [(gogoproto.jsontag) = "path", (gogoproto.moretags) = "yaml:\"path\""];
 
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 // QueryChildrenResponse is the vstorage path children response.
 message QueryChildrenResponse {
-  repeated string children = 1 [
-    (gogoproto.jsontag)    = "children",
-    (gogoproto.moretags)   = "yaml:\"children\""
-  ];
+  repeated string children = 1 [(gogoproto.jsontag) = "children", (gogoproto.moretags) = "yaml:\"children\""];
 
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }

package/proto/agoric/vstorage/vstorage.proto

@@ -7,21 +7,15 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vstorage/types
 
 // Data is the vstorage node data.
 message Data {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    string value = 1 [
-        (gogoproto.jsontag)    = "value",
-        (gogoproto.moretags)   = "yaml:\"value\""
-    ];
+  string value = 1 [(gogoproto.jsontag) = "value", (gogoproto.moretags) = "yaml:\"value\""];
 }
 
 // Children are the immediate names (just one level deep) of subnodes leading to
 // more data from a given vstorage node.
 message Children {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    repeated string children = 1 [
-        (gogoproto.jsontag)    = "children",
-        (gogoproto.moretags)   = "yaml:\"children\""
-    ];
+  repeated string children = 1 [(gogoproto.jsontag) = "children", (gogoproto.moretags) = "yaml:\"children\""];
 }

package/proto/agoric/vtransfer/genesis.proto

@@ -7,12 +7,12 @@ option go_package = "github.com/Agoric/agoric-sdk/golang/cosmos/x/vtransfer/type
 
 // The initial and exported module state.
 message GenesisState {
-    option (gogoproto.equal) = false;
+  option (gogoproto.equal) = false;
 
-    // The list of account addresses that are being watched by the VM.
-    repeated bytes watched_addresses = 1 [
-      (gogoproto.casttype)  = "github.com/cosmos/cosmos-sdk/types.AccAddress",
-      (gogoproto.jsontag)   = "watched_addresses",
-      (gogoproto.moretags)  = "yaml:\"watched_addresses\""
-    ];
+  // The list of account addresses that are being watched by the VM.
+  repeated bytes watched_addresses = 1 [
+    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress",
+    (gogoproto.jsontag)  = "watched_addresses",
+    (gogoproto.moretags) = "yaml:\"watched_addresses\""
+  ];
 }

package/proto/buf.gen.gogo.yaml

@@ -0,0 +1,8 @@
+version: v1
+plugins:
+  - name: gocosmos
+    out: ..
+    opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
+  - name: grpc-gateway
+    out: ..
+    opt: logtostderr=true,allow_colon_final_segments=true

package/proto/buf.gen.pulsar.yaml

@@ -0,0 +1,17 @@
+version: v1
+managed:
+  enabled: true
+  go_package_prefix:
+    default: cosmossdk.io/api
+    except:
+      - buf.build/googleapis/googleapis
+      - buf.build/cosmos/gogo-proto
+      - buf.build/cosmos/cosmos-proto
+    override:
+plugins:
+  - name: go-pulsar
+    out: ../api
+    opt: paths=source_relative
+  - name: go-grpc
+    out: ../api
+    opt: paths=source_relative

package/proto/buf.gen.swagger.yaml

@@ -0,0 +1,5 @@
+version: v1
+plugins:
+  - name: swagger
+    out: ../tmp-swagger-gen
+    opt: logtostderr=true,fqn_for_swagger_name=true,simple_operation_ids=true

package/proto/buf.yaml

@@ -1,7 +1,13 @@
 version: v1
+build:
+  excludes:
+    - google/protobuf
 breaking:
   use:
     - FILE
+  ignore:
+    - gogoproto
+    - google
 lint:
   use:
     - DEFAULT
@@ -13,3 +19,7 @@ lint:
     - SERVICE_SUFFIX
     - PACKAGE_VERSION_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
+  ignore:
+    - cosmos_proto
+    - gogoproto
+    - google

package/scripts/protocgen.sh

@@ -1,31 +1,24 @@
 #!/usr/bin/env bash
 
-set -eo pipefail
-
-protoc_gen_gocosmos() {
-  if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &> /dev/null; then
-    echo -e "\tPlease run this command from somewhere inside the ibc-go folder."
-    return 1
-  fi
-
-  go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2> /dev/null
-}
+# How to run manually:
+# docker build --pull --rm -f "contrib/devtools/Dockerfile" -t cosmossdk-proto:latest "contrib/devtools"
+# docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh
 
-protoc_gen_gocosmos
+set -eo pipefail
 
-proto_dirs=$(find . -path ./third_party -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
+echo "Generating gogo proto code"
+cd proto
+proto_dirs=$(find . -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
-  # NOTE: when migrating to grpc-gateway v2, we will need to remove the
-  # allow_colon_final_segments=true
-  # as per https://grpc-ecosystem.github.io/grpc-gateway/docs/development/grpc-gateway_v2_migration_guide/#withlastmatchwins-and-allow_colon_final_segmentstrue-is-now-default-behaviour
-  protoc \
-    -I proto \
-    -I third_party/proto \
-    --gocosmos_out=plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
-    --grpc-gateway_out=logtostderr=true,allow_colon_final_segments=true:. \
-    $(find "${dir}" -maxdepth 1 -name '*.proto')
+  for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do
+    echo "Generating gogo proto code for $file"
+    buf generate --template buf.gen.gogo.yaml "$file"
+  done
 done
+cd ..
 
 # move proto files to the right places
 cp -r github.com/Agoric/agoric-sdk/golang/cosmos/* ./
 rm -rf github.com
+
+go mod tidy

package/third_party/proto/amino/amino.proto

@@ -0,0 +1,79 @@
+syntax = "proto3";
+
+package amino;
+
+import "google/protobuf/descriptor.proto";
+
+// TODO(fdymylja): once we fully migrate to protov2 the go_package needs to be updated.
+// We need this right now because gogoproto codegen needs to import the extension.
+option go_package = "github.com/cosmos/cosmos-sdk/types/tx/amino";
+
+extend google.protobuf.MessageOptions {
+  // name is the string used when registering a concrete
+  // type into the Amino type registry, via the Amino codec's
+  // `RegisterConcrete()` method. This string MUST be at most 39
+  // characters long, or else the message will be rejected by the
+  // Ledger hardware device.
+  string name = 11110001;
+
+  // encoding describes the encoding format used by Amino for the given
+  // message. The field type is chosen to be a string for
+  // flexibility, but it should ideally be short and expected to be
+  // machine-readable, for example "base64" or "utf8_json". We
+  // highly recommend to use underscores for word separation instead of spaces.
+  //
+  // If left empty, then the Amino encoding is expected to be the same as the
+  // Protobuf one.
+  //
+  // This annotation should not be confused with the `encoding`
+  // one which operates on the field level.
+  string message_encoding = 11110002;
+}
+
+extend google.protobuf.FieldOptions {
+  // encoding describes the encoding format used by Amino for
+  // the given field. The field type is chosen to be a string for
+  // flexibility, but it should ideally be short and expected to be
+  // machine-readable, for example "base64" or "utf8_json". We
+  // highly recommend to use underscores for word separation instead of spaces.
+  //
+  // If left empty, then the Amino encoding is expected to be the same as the
+  // Protobuf one.
+  //
+  // This annotation should not be confused with the
+  // `message_encoding` one which operates on the message level.
+  string encoding = 11110003;
+
+  // field_name sets a different field name (i.e. key name) in
+  // the amino JSON object for the given field.
+  //
+  // Example:
+  //
+  // message Foo {
+  //   string bar = 1 [(amino.field_name) = "baz"];
+  // }
+  //
+  // Then the Amino encoding of Foo will be:
+  // `{"baz":"some value"}`
+  string field_name = 11110004;
+
+  // dont_omitempty sets the field in the JSON object even if
+  // its value is empty, i.e. equal to the Golang zero value. To learn what
+  // the zero values are, see https://go.dev/ref/spec#The_zero_value.
+  //
+  // Fields default to `omitempty`, which is the default behavior when this
+  // annotation is unset. When set to true, then the field value in the
+  // JSON object will be set, i.e. not `undefined`.
+  //
+  // Example:
+  //
+  // message Foo {
+  //   string bar = 1;
+  //   string baz = 2 [(amino.dont_omitempty) = true];
+  // }
+  //
+  // f := Foo{};
+  // out := AminoJSONEncoder(&f);
+  // out == {"baz":""}
+  bool dont_omitempty = 11110005;
+}

package/third_party/proto/cosmos/base/v1beta1/coin.proto

@@ -3,6 +3,7 @@ package cosmos.base.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
+import "amino/amino.proto";
 
 option go_package                       = "github.com/cosmos/cosmos-sdk/types";
 option (gogoproto.goproto_stringer_all) = false;
@@ -16,8 +17,12 @@ message Coin {
   option (gogoproto.equal) = true;
 
   string denom  = 1;
-  string amount = 2
-      [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "Int", (gogoproto.nullable) = false];
+  string amount = 2 [
+    (cosmos_proto.scalar)  = "cosmos.Int",
+    (gogoproto.customtype) = "Int",
+    (gogoproto.nullable)   = false,
+    (amino.dont_omitempty) = true
+  ];
 }
 
 // DecCoin defines a token with a denomination and a decimal amount.