Finschia · 0Tech · Jul 18, 2022 · Jul 11, 2022 · Jul 11, 2022 · Jul 11, 2022
@@ -60,6 +60,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/foundation) [\#545](https://github.com/line/lbm-sdk/pull/545) fix genesis and support abstain
 * (x/auth) [\#563](https://github.com/line/lbm-sdk/pull/563) fix unmarshal bug of `BaseAccountJSON`
 * (client) [\#565](https://github.com/line/lbm-sdk/pull/565) fix the data race problem in `TestQueryABCIHeight`
+* (x/token) [\#589](https://github.com/line/lbm-sdk/pull/589) fix naming collision in x/token enums
 
 ### Breaking Changes
 * (proto) [\#564](https://github.com/line/lbm-sdk/pull/564) change gRPC path to original cosmos path

@@ -39703,8 +39703,14 @@ paths:
                       type: string
                       description: address of the grantee.
                     permission:
-                      type: string
                       description: permission on the token class.
+                      type: string
+                      enum:
+                        - PERMISSION_UNSPECIFIED
+                        - PERMISSION_MODIFY
+                        - PERMISSION_MINT
+                        - PERMISSION_BURN
+                      default: PERMISSION_UNSPECIFIED
                   description: Grant defines permission given to a grantee.
                 description: all the grants on the grantee.
               pagination:
@@ -39850,8 +39856,14 @@ paths:
                     type: string
                     description: address of the grantee.
                   permission:
-                    type: string
                     description: permission on the token class.
+                    type: string
+                    enum:
+                      - PERMISSION_UNSPECIFIED
+                      - PERMISSION_MODIFY
+                      - PERMISSION_MINT
+                      - PERMISSION_BURN
+                    default: PERMISSION_UNSPECIFIED
                 description: Grant defines permission given to a grantee.
             title: >-
               QueryGrantResponse is the response type for the Query/Grant RPC
@@ -39896,6 +39908,11 @@ paths:
           in: path
           required: true
           type: string
+          enum:
+            - PERMISSION_UNSPECIFIED
+            - PERMISSION_MODIFY
+            - PERMISSION_MINT
+            - PERMISSION_BURN
       tags:
         - Query
   '/lbm/token/v1/token_classes/{contract_id}/minted':
@@ -64631,9 +64648,30 @@ definitions:
         type: string
         description: address of the grantee.
       permission:
-        type: string
         description: permission on the token class.
+        type: string
+        enum:
+          - PERMISSION_UNSPECIFIED
+          - PERMISSION_MODIFY
+          - PERMISSION_MINT
+          - PERMISSION_BURN
+        default: PERMISSION_UNSPECIFIED
     description: Grant defines permission given to a grantee.
+  lbm.token.v1.Permission:
+    type: string
+    enum:
+      - PERMISSION_UNSPECIFIED
+      - PERMISSION_MODIFY
+      - PERMISSION_MINT
+      - PERMISSION_BURN
+    default: PERMISSION_UNSPECIFIED
+    description: |-
+      Permission enumerates the valid permissions on a token class.
+
+       - PERMISSION_UNSPECIFIED: unspecified defines the default permission which is invalid.
+       - PERMISSION_MODIFY: PERMISSION_MODIFY defines a permission to modify a contract.
+       - PERMISSION_MINT: PERMISSION_MINT defines a permission to mint tokens of a contract.
+       - PERMISSION_BURN: PERMISSION_BURN defines a permission to burn tokens of a contract.
   lbm.token.v1.QueryApprovedResponse:
     type: object
     properties:
@@ -64689,8 +64727,14 @@ definitions:
             type: string
             description: address of the grantee.
           permission:
-            type: string
             description: permission on the token class.
+            type: string
+            enum:
+              - PERMISSION_UNSPECIFIED
+              - PERMISSION_MODIFY
+              - PERMISSION_MINT
+              - PERMISSION_BURN
+            default: PERMISSION_UNSPECIFIED
         description: Grant defines permission given to a grantee.
     title: |-
       QueryGrantResponse is the response type for the Query/Grant RPC method
@@ -64707,8 +64751,14 @@ definitions:
               type: string
               description: address of the grantee.
             permission:
-              type: string
               description: permission on the token class.
+              type: string
+              enum:
+                - PERMISSION_UNSPECIFIED
+                - PERMISSION_MODIFY
+                - PERMISSION_MINT
+                - PERMISSION_BURN
+              default: PERMISSION_UNSPECIFIED
           description: Grant defines permission given to a grantee.
         description: all the grants on the grantee.
       pagination:

@@ -915,6 +915,7 @@
     - [Params](#lbm.token.v1.Params)
     - [TokenClass](#lbm.token.v1.TokenClass)
 
+    - [LegacyPermission](#lbm.token.v1.LegacyPermission)
     - [Permission](#lbm.token.v1.Permission)
 
 - [lbm/token/v1/event.proto](#lbm/token/v1/event.proto)
@@ -13333,7 +13334,7 @@ Grant defines permission given to a grantee.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `grantee` | [string](#string) |  | address of the grantee. |
-| `permission` | [string](#string) |  | permission on the token class. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | permission on the token class. |
 
 
 
@@ -13389,17 +13390,33 @@ TokenClass defines token information.
  <!-- end messages -->
 
 
+<a name="lbm.token.v1.LegacyPermission"></a>
+
+### LegacyPermission
+Deprecated: use Permission
+
+LegacyPermission enumerates the valid permissions on a token class.
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| LEGACY_PERMISSION_UNSPECIFIED | 0 | unspecified defines the default permission which is invalid. |
+| LEGACY_PERMISSION_MODIFY | 1 | modify defines a permission to modify a contract. |
+| LEGACY_PERMISSION_MINT | 2 | mint defines a permission to mint tokens of a contract. |
+| LEGACY_PERMISSION_BURN | 3 | burn defines a permission to burn tokens of a contract. |
+
+
+
 <a name="lbm.token.v1.Permission"></a>
 
 ### Permission
 Permission enumerates the valid permissions on a token class.
 
 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| unspecified | 0 |  |
-| modify | 1 |  |
-| mint | 2 |  |
-| burn | 3 |  |
+| PERMISSION_UNSPECIFIED | 0 | unspecified defines the default permission which is invalid. |
+| PERMISSION_MODIFY | 1 | PERMISSION_MODIFY defines a permission to modify a contract. |
+| PERMISSION_MINT | 2 | PERMISSION_MINT defines a permission to mint tokens of a contract. |
+| PERMISSION_BURN | 3 | PERMISSION_BURN defines a permission to burn tokens of a contract. |
 
 
  <!-- end enums -->
@@ -13429,7 +13446,7 @@ Since: 0.46.0 (finschia)
 | ----- | ---- | ----- | ----------- |
 | `contract_id` | [string](#string) |  | contract id associated with the token class. |
 | `grantee` | [string](#string) |  | address of the grantee which abandons its grant. |
-| `permission` | [string](#string) |  | permission on the token class. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | permission on the token class. |
 
 
 
@@ -13490,7 +13507,7 @@ Since: 0.46.0 (finschia)
 | `contract_id` | [string](#string) |  | contract id associated with the token class. |
 | `granter` | [string](#string) |  | address which granted the permission to `grantee`. it would be empty where the event is triggered by the issuance. |
 | `grantee` | [string](#string) |  | address of the grantee. |
-| `permission` | [string](#string) |  | permission on the token class. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | permission on the token class. |
 
 
 
@@ -13605,47 +13622,47 @@ Since: 0.46.0 (finschia)
 
 ### AttributeKey
 AttributeKey enumerates the valid attribute keys on x/token.
-For the legacy events.
 
 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| unspecified | 0 |  |
-| name | 1 |  |
-| symbol | 2 |  |
-| meta | 3 |  |
-| contract_id | 4 |  |
-| owner | 5 |  |
-| amount | 6 |  |
-| decimals | 7 |  |
-| img_uri | 8 |  |
-| mintable | 9 |  |
-| from | 10 |  |
-| to | 11 |  |
-| perm | 12 |  |
-| approver | 13 |  |
-| proxy | 14 |  |
+| ATTRIBUTE_KEY_UNSPECIFIED | 0 |  |
+| ATTRIBUTE_KEY_NAME | 1 |  |
+| ATTRIBUTE_KEY_SYMBOL | 2 |  |
+| ATTRIBUTE_KEY_META | 3 |  |
+| ATTRIBUTE_KEY_CONTRACT_ID | 4 |  |
+| ATTRIBUTE_KEY_OWNER | 5 |  |
+| ATTRIBUTE_KEY_AMOUNT | 6 |  |
+| ATTRIBUTE_KEY_DECIMALS | 7 |  |
+| ATTRIBUTE_KEY_IMG_URI | 8 |  |
+| ATTRIBUTE_KEY_MINTABLE | 9 |  |
+| ATTRIBUTE_KEY_FROM | 10 |  |
+| ATTRIBUTE_KEY_TO | 11 |  |
+| ATTRIBUTE_KEY_PERM | 12 |  |
+| ATTRIBUTE_KEY_APPROVER | 13 |  |
+| ATTRIBUTE_KEY_PROXY | 14 |  |
 
 
 
 <a name="lbm.token.v1.EventType"></a>
 
 ### EventType
+Deprecated: use typed events.
+
 EventType enumerates the valid event types on x/token.
-For the legacy events.
 
 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| unspecified | 0 |  |
-| issue | 1 |  |
-| mint | 2 |  |
-| burn | 3 |  |
-| burn_from | 4 |  |
-| modify_token | 5 |  |
-| transfer | 6 |  |
-| transfer_from | 7 |  |
-| grant_perm | 8 |  |
-| revoke_perm | 9 |  |
-| approve_token | 10 |  |
+| EVENT_TYPE_UNSPECIFIED | 0 |  |
+| EVENT_TYPE_ISSUE | 1 |  |
+| EVENT_TYPE_MINT | 2 |  |
+| EVENT_TYPE_BURN | 3 |  |
+| EVENT_TYPE_BURN_FROM | 4 |  |
+| EVENT_TYPE_MODIFY_TOKEN | 5 |  |
+| EVENT_TYPE_TRANSFER | 6 |  |
+| EVENT_TYPE_TRANSFER_FROM | 7 |  |
+| EVENT_TYPE_GRANT_PERM | 8 |  |
+| EVENT_TYPE_REVOKE_PERM | 9 |  |
+| EVENT_TYPE_APPROVE_TOKEN | 10 |  |
 
 
  <!-- end enums -->
@@ -13939,7 +13956,7 @@ Since: finschia
 | ----- | ---- | ----- | ----------- |
 | `contract_id` | [string](#string) |  | contract id associated with the token class. |
 | `grantee` | [string](#string) |  | grantee which has permissions on the token class. |
-| `permission` | [string](#string) |  | a permission given to the grantee. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | a permission given to the grantee. |
 
 
 
@@ -14212,7 +14229,7 @@ Since: 0.46.0 (finschia)
 | ----- | ---- | ----- | ----------- |
 | `contract_id` | [string](#string) |  | contract id associated with the token class. |
 | `grantee` | [string](#string) |  | address of the grantee which abandons the permission. |
-| `permission` | [string](#string) |  | permission on the token class. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | permission on the token class. |
 
 
 
@@ -14393,7 +14410,7 @@ Since: 0.46.0 (finschia)
 | `contract_id` | [string](#string) |  | contract id associated with the token class. |
 | `granter` | [string](#string) |  | address of the granter which must have the permission to give. |
 | `grantee` | [string](#string) |  | address of the grantee. |
-| `permission` | [string](#string) |  | permission on the token class. |
+| `permission` | [Permission](#lbm.token.v1.Permission) |  | permission on the token class. |
 
 
 

@@ -7,40 +7,48 @@ import "lbm/token/v1/token.proto";
 
 option go_package = "github.com/line/lbm-sdk/x/token";
 
+// Deprecated: use typed events.
+//
 // EventType enumerates the valid event types on x/token.
-// For the legacy events.
 enum EventType {
-  unspecified   = 0 [(gogoproto.enumvalue_customname) = "Unspecified"];
-  issue         = 1 [(gogoproto.enumvalue_customname) = "IssueToken"];
-  mint          = 2 [(gogoproto.enumvalue_customname) = "MintToken"];
-  burn          = 3 [(gogoproto.enumvalue_customname) = "BurnToken"];
-  burn_from     = 4 [(gogoproto.enumvalue_customname) = "BurnTokenFrom"];
-  modify_token  = 5 [(gogoproto.enumvalue_customname) = "ModifyToken"];
-  transfer      = 6 [(gogoproto.enumvalue_customname) = "Transfer"];
-  transfer_from = 7 [(gogoproto.enumvalue_customname) = "TransferFrom"];
-  grant_perm    = 8 [(gogoproto.enumvalue_customname) = "GrantPermToken"];
-  revoke_perm   = 9 [(gogoproto.enumvalue_customname) = "RevokePermToken"];
-  approve_token = 10 [(gogoproto.enumvalue_customname) = "ApproveToken"];
+  option (gogoproto.goproto_enum_stringer) = false;
+  option (gogoproto.goproto_enum_prefix)   = false;
+
+  EVENT_TYPE_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "EventTypeUnspecified"];
+
+  EVENT_TYPE_ISSUE         = 1 [(gogoproto.enumvalue_customname) = "EventTypeIssueToken"];
+  EVENT_TYPE_MINT          = 2 [(gogoproto.enumvalue_customname) = "EventTypeMintToken"];
+  EVENT_TYPE_BURN          = 3 [(gogoproto.enumvalue_customname) = "EventTypeBurnToken"];
+  EVENT_TYPE_BURN_FROM     = 4 [(gogoproto.enumvalue_customname) = "EventTypeBurnTokenFrom"];
+  EVENT_TYPE_MODIFY_TOKEN  = 5 [(gogoproto.enumvalue_customname) = "EventTypeModifyToken"];
+  EVENT_TYPE_TRANSFER      = 6 [(gogoproto.enumvalue_customname) = "EventTypeTransfer"];
+  EVENT_TYPE_TRANSFER_FROM = 7 [(gogoproto.enumvalue_customname) = "EventTypeTransferFrom"];
+  EVENT_TYPE_GRANT_PERM    = 8 [(gogoproto.enumvalue_customname) = "EventTypeGrantPermToken"];
+  EVENT_TYPE_REVOKE_PERM   = 9 [(gogoproto.enumvalue_customname) = "EventTypeRevokePermToken"];
+  EVENT_TYPE_APPROVE_TOKEN = 10 [(gogoproto.enumvalue_customname) = "EventTypeApproveToken"];
 }
 
 // AttributeKey enumerates the valid attribute keys on x/token.
-// For the legacy events.
 enum AttributeKey {
-  unspecified = 0 [(gogoproto.enumvalue_customname) = "Unspecified"];
-  name        = 1 [(gogoproto.enumvalue_customname) = "Name"];
-  symbol      = 2 [(gogoproto.enumvalue_customname) = "Symbol"];
-  meta        = 3 [(gogoproto.enumvalue_customname) = "Meta"];
-  contract_id = 4 [(gogoproto.enumvalue_customname) = "ContractID"];
-  owner       = 5 [(gogoproto.enumvalue_customname) = "Owner"];
-  amount      = 6 [(gogoproto.enumvalue_customname) = "Amount"];
-  decimals    = 7 [(gogoproto.enumvalue_customname) = "Decimals"];
-  img_uri     = 8 [(gogoproto.enumvalue_customname) = "ImageURI"];
-  mintable    = 9 [(gogoproto.enumvalue_customname) = "Mintable"];
-  from        = 10 [(gogoproto.enumvalue_customname) = "From"];
-  to          = 11 [(gogoproto.enumvalue_customname) = "To"];
-  perm        = 12 [(gogoproto.enumvalue_customname) = "Perm"];
-  approver    = 13 [(gogoproto.enumvalue_customname) = "Approver"];
-  proxy       = 14 [(gogoproto.enumvalue_customname) = "Proxy"];
+  option (gogoproto.goproto_enum_stringer) = false;
+  option (gogoproto.goproto_enum_prefix)   = false;
+
+  ATTRIBUTE_KEY_UNSPECIFIED = 0 [(gogoproto.enumvalue_customname) = "AttributeKeyUnspecified"];
+
+  ATTRIBUTE_KEY_NAME        = 1 [(gogoproto.enumvalue_customname) = "AttributeKeyName"];
+  ATTRIBUTE_KEY_SYMBOL      = 2 [(gogoproto.enumvalue_customname) = "AttributeKeySymbol"];
+  ATTRIBUTE_KEY_META        = 3 [(gogoproto.enumvalue_customname) = "AttributeKeyMeta"];
+  ATTRIBUTE_KEY_CONTRACT_ID = 4 [(gogoproto.enumvalue_customname) = "AttributeKeyContractID"];
+  ATTRIBUTE_KEY_OWNER       = 5 [(gogoproto.enumvalue_customname) = "AttributeKeyOwner"];
+  ATTRIBUTE_KEY_AMOUNT      = 6 [(gogoproto.enumvalue_customname) = "AttributeKeyAmount"];
+  ATTRIBUTE_KEY_DECIMALS    = 7 [(gogoproto.enumvalue_customname) = "AttributeKeyDecimals"];
+  ATTRIBUTE_KEY_IMG_URI     = 8 [(gogoproto.enumvalue_customname) = "AttributeKeyImageURI"];
+  ATTRIBUTE_KEY_MINTABLE    = 9 [(gogoproto.enumvalue_customname) = "AttributeKeyMintable"];
+  ATTRIBUTE_KEY_FROM        = 10 [(gogoproto.enumvalue_customname) = "AttributeKeyFrom"];
+  ATTRIBUTE_KEY_TO          = 11 [(gogoproto.enumvalue_customname) = "AttributeKeyTo"];
+  ATTRIBUTE_KEY_PERM        = 12 [(gogoproto.enumvalue_customname) = "AttributeKeyPerm"];
+  ATTRIBUTE_KEY_APPROVER    = 13 [(gogoproto.enumvalue_customname) = "AttributeKeyApprover"];
+  ATTRIBUTE_KEY_PROXY       = 14 [(gogoproto.enumvalue_customname) = "AttributeKeyProxy"];
 }
 
 // EventSent is emitted when tokens are transferred.
@@ -117,7 +125,7 @@ message EventGrant {
   // address of the grantee.
   string grantee = 3;
   // permission on the token class.
-  string permission = 4;
+  Permission permission = 4;
 }
 
 // EventAbandon is emitted when a grantee abandons its permission.
@@ -129,7 +137,7 @@ message EventAbandon {
   // address of the grantee which abandons its grant.
   string grantee = 2;
   // permission on the token class.
-  string permission = 3;
+  Permission permission = 3;
 }
 
 // EventMinted is emitted when tokens are minted.

@@ -209,7 +209,7 @@ message QueryGrantRequest {
   // grantee which has permissions on the token class.
   string grantee = 2;
   // a permission given to the grantee.
-  string permission = 3;
+  Permission permission = 3;
 }
 
 // QueryGrantResponse is the response type for the Query/Grant RPC method