Merge branch 'master' into ryan/1028-marketplace-queries

proto/regen/data/v1/events.proto

@@ -19,3 +19,18 @@ message EventAttest {
   // the data.
   string attestor = 2;
 }
+
+// EventDefineResolver is an event emitted when a resolved is defined on chain.
+message EventDefineResolver {
+  // id is the ID of the defined resolver.
+  uint64 id = 1;
+}
+
+// EventRegisterResolver is an event emitted when data is registered to a resolver on chain.
+message EventRegisterResolver {
+  // id is the ID of the resolver that the data was registered to.
+  uint64 id = 1;
+
+  // iri is the IRI of the data that was registered.
+  string iri = 2;
+}

proto/regen/ecocredit/v1/state.proto

@@ -99,9 +99,9 @@ message Project {
   // for efficient lookups. This links a project to a credit class.
   uint64 class_key = 4;
 
-  // project_jurisdiction is the jurisdiction of the project.
-  // Full documentation can be found in MsgCreateProject.project_jurisdiction.
-  string project_jurisdiction = 5;
+  // jurisdiction is the jurisdiction of the project.
+  // Full documentation can be found in MsgCreateProject.jurisdiction.
+  string jurisdiction = 5;
 
   // metadata is any arbitrary metadata attached to the project.
   string metadata = 6;

proto/regen/ecocredit/v1/tx.proto

@@ -114,13 +114,13 @@ message MsgCreateProject {
   // metadata is any arbitrary metadata attached to the project.
   string metadata = 3;
 
-  // project_jurisdiction is the jurisdiction of the project backing the credits
+  // jurisdiction is the jurisdiction of the project backing the credits
   // in this batch. It is a string of the form
   // <country-code>[-<sub-national-code>[ <postal-code>]], with the first two
   // fields conforming to ISO 3166-2, and postal-code being up to 64
   // alphanumeric characters. country-code is required, while sub-national-code
   // and postal-code are optional and can be added for increased precision.
-  string project_jurisdiction = 4;
+  string jurisdiction = 4;
 
   // project_id is an optional user-specified project ID which can be used
   // instead of an auto-generated ID. If project_id is provided, it must be