chore: Update linter and protogen configuration (#1478)

* add protolint yaml * Update .protolint.yml with Evmos settings * Add super-linter.yml for GH action * Copy .markdownlint.yml settings from Evmos * Sort proto imports * address protolint error in all Protobuf files * update Makefile to mirror Proto commands for Evmos * remove unnecessary go get command in protocgen.sh when using cosmos docker image * copy .clang-format from Evmos repo * apply make proto-format * Execute make proto-all after changes to config are complete * address last linter comment
2022-11-25 11:02:20 +01:00 · 2022-11-25 11:02:20 +01:00 · 3752485b27
commit 3752485b27
parent 16fb2e1110
30 changed files with 681 additions and 527 deletions
--- a/.clang-format
+++ b/.clang-format
@ -1,115 +1,6 @@
 ---
 Language: Proto
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: true
-AlignEscapedNewlines: Right
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
+BasedOnStyle: google
 ColumnLimit: 120
-CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-FixNamespaceComments: true
-ForEachMacros:   
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-IndentPPDirectives: None
 IndentWidth: 2
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-RawStringFormats: 
-  - Delimiters:
-    - pb
-    Language:        TextProto
-    BasedOnStyle:    google
-ReflowComments:  true
-SortIncludes:    true
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        8
-UseTab:          Never
 ...
--- a/.github/workflows/super-linter.yml
+++ b/.github/workflows/super-linter.yml
@ -0,0 +1,38 @@
+# This workflow executes several linters on changed files based on languages used in your code base whenever
+# you push a code or open a pull request.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/github/super-linter
+---
+name: Lint Code Base
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+jobs:
+  run-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
+
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          LINTER_RULES_PATH: /
+          YAML_CONFIG_FILE: .yamllint
+          VALIDATE_ALL_CODEBASE: false
+          MARKDOWN_CONFIG_FILE: .markdownlint.yml
+          PROTOBUF_CONFIG_FILE: .protolint.yml
+          VALIDATE_NATURAL_LANGUAGE: false
+          VALIDATE_OPENAPI: false
+          VALIDATE_JSCPD: false
+          VALIDATE_GO: false
+          DEFAULT_BRANCH: "main"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.markdownlint.yml
+++ b/.markdownlint.yml
@ -15,6 +15,7 @@
 "MD036": false
 "MD040": false
 "MD041": false
+"MD051": false
 "MD049":
  "style": "asterisk"
 "no-hard-tabs": false
--- a/.protolint.yml
+++ b/.protolint.yml
@ -0,0 +1,174 @@
+---
+# Lint directives.
+lint:
+  # # Linter files to ignore.
+  # ignores:
+  #   - id: MESSAGE_NAMES_UPPER_CAMEL_CASE
+  #     files:
+  #       # NOTE: UNIX paths will be properly accepted by both UNIX and Windows.
+  #       - _example/proto/simple.proto
+  #   - id: ENUM_NAMES_UPPER_CAMEL_CASE
+  #     files:
+  #       - path/to/foo.proto
+
+  # # Linter files to walk.
+  # files:
+  #   # The specific files to exclude.
+  #   exclude:
+  #     # NOTE: UNIX paths will be properly accepted by both UNIX and Windows.
+  #     - path/to/file
+
+  # # Linter directories to walk.
+  # directories:
+  #   # The specific directories to exclude.
+  #   exclude:
+  #     # NOTE: UNIX paths will be properly accepted by both UNIX and Windows.
+  #     - path/to/dir
+
+  # Linter rules.
+  # Run `protolint list` to see all available rules.
+  rules:
+    # Determines whether or not to include the default set of linters.
+    no_default: true
+
+    # Set the default to all linters. This option works the other way around as no_default does.
+    # If you want to enable this option, delete the comment out below and no_default.
+    # all_default: true
+
+    # The specific linters to add.
+    add:
+      - FIELD_NAMES_LOWER_SNAKE_CASE
+      - MESSAGE_NAMES_UPPER_CAMEL_CASE
+      - MAX_LINE_LENGTH
+      - INDENT
+      # - SERVICE_NAMES_END_WITH
+      - FIELD_NAMES_EXCLUDE_PREPOSITIONS
+      - MESSAGE_NAMES_EXCLUDE_PREPOSITIONS
+      - FILE_NAMES_LOWER_SNAKE_CASE
+      - IMPORTS_SORTED
+      - PACKAGE_NAME_LOWER_CASE
+      - ORDER
+      - MESSAGES_HAVE_COMMENT
+      - SERVICES_HAVE_COMMENT
+      - RPCS_HAVE_COMMENT
+      - FIELDS_HAVE_COMMENT
+      - PROTO3_FIELDS_AVOID_REQUIRED
+      - PROTO3_GROUPS_AVOID
+      # - REPEATED_FIELD_NAMES_PLURALIZED
+      - ENUMS_HAVE_COMMENT
+      - ENUM_FIELDS_HAVE_COMMENT
+      - SYNTAX_CONSISTENT
+      - RPC_NAMES_UPPER_CAMEL_CASE
+      # - FILE_HAS_COMMENT
+      - QUOTE_CONSISTENT
+
+    # # The specific linters to remove.
+    # remove:
+    #   - RPC_NAMES_UPPER_CAMEL_CASE
+
+  # Linter rules option.
+  rules_option:
+    # MAX_LINE_LENGTH rule option.
+    max_line_length:
+      # Enforces a maximum line length
+      max_chars: 120
+      # Specifies the character count for tab characters
+      tab_chars: 2
+
+    # INDENT rule option.
+    indent:
+      # Available styles are 4(4-spaces), 2(2-spaces) or tab.
+      style: 2
+      # Specifies if it should stop considering and inserting new lines at the appropriate positions
+      # when the inner elements are on the same line. Default is false.
+      not_insert_newline: true
+
+    # # FILE_NAMES_LOWER_SNAKE_CASE rule option.
+    # file_names_lower_snake_case:
+    #   excludes:
+    #     - ../proto/invalidFileName.proto
+
+    # QUOTE_CONSISTENT rule option.
+    quote_consistent:
+      # Available quote are "double" or "single".
+      quote: double
+
+    # ENUM_FIELD_NAMES_ZERO_VALUE_END_WITH rule option.
+    enum_field_names_zero_value_end_with:
+      suffix: INVALID
+
+    # # SERVICE_NAMES_END_WITH rule option.
+    # service_names_end_with:
+    #   text: Service
+
+    # FIELD_NAMES_EXCLUDE_PREPOSITIONS rule option.
+    field_names_exclude_prepositions:
+      # The specific prepositions to determine if the field name includes.
+      prepositions:
+        - for
+        - at
+        - of
+      # The specific keywords including prepositions to ignore. E.g. end_of_support is a term you would like to use, and skip checking.
+      excludes:
+        - duration_of_decay
+
+    # # REPEATED_FIELD_NAMES_PLURALIZED rule option.
+    # ## The spec for each rules follows the implementation of https://github.com/gertd/go-pluralize.
+    # ## Plus, you can refer to this rule's test code.
+    # repeated_field_names_pluralized:
+    #   uncountable_rules:
+    #     - paper
+    #   irregular_rules:
+    #     Irregular: Regular
+
+    # MESSAGE_NAMES_EXCLUDE_PREPOSITIONS rule option.
+    message_names_exclude_prepositions:
+      # The specific prepositions to determine if the message name includes.
+      prepositions:
+        - With
+        - For
+        - Of
+      # # The specific keywords including prepositions to ignore. E.g. EndOfSupport is a term you would like to use, and skip checking.
+      # excludes:
+      #   - EndOfSupport
+
+    # #  RPC_NAMES_CASE rule option.
+    # rpc_names_case:
+    #   # The specific convention the name should conforms to.
+    #   ## Available conventions are "lower_camel_case", "upper_snake_case", or "lower_snake_case".
+    #   convention: upper_snake_case
+
+    # MESSAGES_HAVE_COMMENT rule option.
+    messages_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # SERVICES_HAVE_COMMENT rule option.
+    services_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # RPCS_HAVE_COMMENT rule option.
+    rpcs_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # FIELDS_HAVE_COMMENT rule option.
+    fields_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # ENUMS_HAVE_COMMENT rule option.
+    enums_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # ENUM_FIELDS_HAVE_COMMENT rule option.
+    enum_fields_have_comment:
+      # Comments need to begin with the name of the thing being described. default is false.
+      should_follow_golang_style: true
+
+    # # SYNTAX_CONSISTENT rule option.
+    # syntax_consistent:
+    #   # Default is proto3.
+    #   version: proto2
--- a/23
+++ b/23
@ -437,6 +437,14 @@ protoImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /
 protoCosmosVer=0.11.2
 protoCosmosName=ghcr.io/cosmos/proto-builder:$(protoCosmosVer)
 protoCosmosImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /workspace $(protoCosmosName)
+# ------
+# NOTE: Link to the yoheimuta/protolint docker images:
+#       https://hub.docker.com/r/yoheimuta/protolint/tags
+#
+protolintVer=0.42.2
+protolintName=yoheimuta/protolint:$(protolintVer)
+protolintImage=$(DOCKER) run --network host --rm -v $(CURDIR):/workspace --workdir /workspace $(protolintName)
+

 # ------
 # NOTE: If you are experiencing problems running these commands, try deleting
@ -448,24 +456,27 @@ proto-gen:
 	@echo "Generating Protobuf files"
 	$(protoImage) sh ./scripts/protocgen.sh

-proto-swagger-gen:
-	@echo "Generating Protobuf Swagger"
-	$(protoImage) sh ./scripts/protoc-swagger-gen.sh
+
+# TODO: Rethink API docs generation
+# proto-swagger-gen:
+# 	@echo "Generating Protobuf Swagger"
+# 	$(protoImage) sh ./scripts/protoc-swagger-gen.sh

 proto-format:
 	@echo "Formatting Protobuf files"
-	$(protoCosmosImage) find ./ -name "*.proto" -exec clang-format -i {} \;
+	$(protoCosmosImage) find ./ -name *.proto -exec clang-format -i {} \;

+# NOTE: The linter configuration lives in .protolint.yaml
 proto-lint:
 	@echo "Linting Protobuf files"
-	$(protoImage) buf lint --error-format=json
+	$(protolintImage) lint ./proto

 proto-check-breaking:
 	@echo "Checking Protobuf files for breaking changes"
 	$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main


-.PHONY: proto-all proto-gen proto-gen-any proto-swagger-gen proto-format proto-lint proto-check-breaking
+.PHONY: proto-all proto-gen proto-gen-any proto-format proto-lint proto-check-breaking

 ###############################################################################
 ###                                Localnet                                 ###
--- a/crypto/ethsecp256k1/keys.pb.go
+++ b/crypto/ethsecp256k1/keys.pb.go
@ -27,6 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // Tendermint's PubKey interface. It represents the 33-byte compressed public
 // key format.
 type PubKey struct {
+	// key is the public key in byte form
 	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 }

@ -72,6 +73,7 @@ func (m *PubKey) GetKey() []byte {
 // PrivKey defines a type alias for an ecdsa.PrivateKey that implements
 // Tendermint's PrivateKey interface.
 type PrivKey struct {
+	// key is the private key in byte form
 	Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 }

--- a/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto
+++ b/proto/ethermint/crypto/v1/ethsecp256k1/keys.proto
@ -11,11 +11,13 @@ option go_package = "github.com/evmos/ethermint/crypto/ethsecp256k1";
 message PubKey {
  option (gogoproto.goproto_stringer) = false;

+  // key is the public key in byte form
  bytes key = 1;
 }

 // PrivKey defines a type alias for an ecdsa.PrivateKey that implements
 // Tendermint's PrivateKey interface.
 message PrivKey {
+  // key is the private key in byte form
  bytes key = 1;
 }
--- a/proto/ethermint/evm/v1/evm.proto
+++ b/proto/ethermint/evm/v1/evm.proto
@ -7,18 +7,18 @@ option go_package = "github.com/evmos/ethermint/x/evm/types";

 // Params defines the EVM module parameters
 message Params {
-  // evm denom represents the token denomination used to run the EVM state
+  // evm_denom represents the token denomination used to run the EVM state
  // transitions.
  string evm_denom = 1 [(gogoproto.moretags) = "yaml:\"evm_denom\""];
-  // enable create toggles state transitions that use the vm.Create function
+  // enable_create toggles state transitions that use the vm.Create function
  bool enable_create = 2 [(gogoproto.moretags) = "yaml:\"enable_create\""];
-  // enable call toggles state transitions that use the vm.Call function
+  // enable_call toggles state transitions that use the vm.Call function
  bool enable_call = 3 [(gogoproto.moretags) = "yaml:\"enable_call\""];
-  // extra eips defines the additional EIPs for the vm.Config
+  // extra_eips defines the additional EIPs for the vm.Config
  repeated int64 extra_eips = 4 [(gogoproto.customname) = "ExtraEIPs", (gogoproto.moretags) = "yaml:\"extra_eips\""];
-  // chain config defines the EVM chain configuration parameters
+  // chain_config defines the EVM chain configuration parameters
  ChainConfig chain_config = 5 [(gogoproto.moretags) = "yaml:\"chain_config\"", (gogoproto.nullable) = false];
-  // Allow unprotected transactions defines if replay-protected (i.e non EIP155
+  // allow_unprotected_txs defines if replay-protected (i.e non EIP155
  // signed) transactions can be executed on the state machine.
  bool allow_unprotected_txs = 6;
 }
@ -26,67 +26,67 @@ message Params {
 // ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values
 // instead of *big.Int.
 message ChainConfig {
-  // Homestead switch block (nil no fork, 0 = already homestead)
+  // homestead_block switch (nil no fork, 0 = already homestead)
  string homestead_block = 1 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"homestead_block\""
  ];
-  // TheDAO hard-fork switch block (nil no fork)
+  // dao_fork_block corresponds to TheDAO hard-fork switch block (nil no fork)
  string dao_fork_block = 2 [
    (gogoproto.customname) = "DAOForkBlock",
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"dao_fork_block\""
  ];
-  // Whether the nodes supports or opposes the DAO hard-fork
+  // dao_fork_support defines whether the nodes supports or opposes the DAO hard-fork
  bool dao_fork_support = 3
      [(gogoproto.customname) = "DAOForkSupport", (gogoproto.moretags) = "yaml:\"dao_fork_support\""];
-  // EIP150 implements the Gas price changes
+  // eip150_block: EIP150 implements the Gas price changes
  // (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
  string eip150_block = 4 [
    (gogoproto.customname) = "EIP150Block",
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"eip150_block\""
  ];
-  // EIP150 HF hash (needed for header only clients as only gas pricing changed)
+  // eip150_hash: EIP150 HF hash (needed for header only clients as only gas pricing changed)
  string eip150_hash = 5 [(gogoproto.customname) = "EIP150Hash", (gogoproto.moretags) = "yaml:\"byzantium_block\""];
-  // EIP155Block HF block
+  // eip155_block: EIP155Block HF block
  string eip155_block = 6 [
    (gogoproto.customname) = "EIP155Block",
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"eip155_block\""
  ];
-  // EIP158 HF block
+  // eip158_block: EIP158 HF block
  string eip158_block = 7 [
    (gogoproto.customname) = "EIP158Block",
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"eip158_block\""
  ];
-  // Byzantium switch block (nil no fork, 0 = already on byzantium)
+  // byzantium_block: Byzantium switch block (nil no fork, 0 = already on byzantium)
  string byzantium_block = 8 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"byzantium_block\""
  ];
-  // Constantinople switch block (nil no fork, 0 = already activated)
+  // constantinople_block: Constantinople switch block (nil no fork, 0 = already activated)
  string constantinople_block = 9 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"constantinople_block\""
  ];
-  // Petersburg switch block (nil same as Constantinople)
+  // petersburg_block: Petersburg switch block (nil same as Constantinople)
  string petersburg_block = 10 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"petersburg_block\""
  ];
-  // Istanbul switch block (nil no fork, 0 = already on istanbul)
+  // istanbul_block: Istanbul switch block (nil no fork, 0 = already on istanbul)
  string istanbul_block = 11 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"istanbul_block\""
  ];
-  // Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
+  // muir_glacier_block: Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
  string muir_glacier_block = 12 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"muir_glacier_block\""
  ];
-  // Berlin switch block (nil = no fork, 0 = already on berlin)
+  // berlin_block: Berlin switch block (nil = no fork, 0 = already on berlin)
  string berlin_block = 13 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"berlin_block\""
@ -94,12 +94,12 @@ message ChainConfig {
  // DEPRECATED: EWASM, YOLOV3 and Catalyst block have been deprecated
  reserved 14, 15, 16;
  reserved "yolo_v3_block", "ewasm_block", "catalyst_block";
-  // London switch block (nil = no fork, 0 = already on london)
+  // london_block: London switch block (nil = no fork, 0 = already on london)
  string london_block = 17 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"london_block\""
  ];
-  // Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
+  // arrow_glacier_block: Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
  string arrow_glacier_block = 18 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"arrow_glacier_block\""
@ -107,12 +107,12 @@ message ChainConfig {
  // DEPRECATED: merge fork block was deprecated: https://github.com/ethereum/go-ethereum/pull/24904
  reserved 19;
  reserved "merge_fork_block";
-  //  EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated)
+  // gray_glacier_block: EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated)
  string gray_glacier_block = 20 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"gray_glacier_block\""
  ];
-  // Virtual fork after The Merge to use as a network splitter
+  // merge_netsplit_block: Virtual fork after The Merge to use as a network splitter
  string merge_netsplit_block = 21 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.moretags) = "yaml:\"merge_netsplit_block\""
@ -121,7 +121,9 @@ message ChainConfig {

 // State represents a single Storage key value pair item.
 message State {
+  // key is the stored key
  string key = 1;
+  // value is the stored value for the given key
  string value = 2;
 }

@ -129,38 +131,38 @@ message State {
 // with a given hash. It it used for import/export data as transactions are not
 // persisted on blockchain state after an upgrade.
 message TransactionLogs {
+  // hash of the transaction
  string hash = 1;
+  // logs is an array of Logs for the given transaction hash
  repeated Log logs = 2;
 }

 // Log represents an protobuf compatible Ethereum Log that defines a contract
 // log event. These events are generated by the LOG opcode and stored/indexed by
 // the node.
+//
+// NOTE: address, topics and data are consensus fields. The rest of the fields
+// are derived, i.e. filled in by the nodes, but not secured by consensus.
 message Log {
-  // Consensus fields:
-
  // address of the contract that generated the event
  string address = 1;
-  // list of topics provided by the contract.
+  // topics is a list of topics provided by the contract.
  repeated string topics = 2;
-  // supplied by the contract, usually ABI-encoded
+  // data which is supplied by the contract, usually ABI-encoded
  bytes data = 3;

-  // Derived fields. These fields are filled in by the node
-  // but not secured by consensus.
-
-  // block in which the transaction was included
+  // block_number of the block in which the transaction was included
  uint64 block_number = 4 [(gogoproto.jsontag) = "blockNumber"];
-  // hash of the transaction
+  // tx_hash is the transaction hash
  string tx_hash = 5 [(gogoproto.jsontag) = "transactionHash"];
-  // index of the transaction in the block
+  // tx_index of the transaction in the block
  uint64 tx_index = 6 [(gogoproto.jsontag) = "transactionIndex"];
-  // hash of the block in which the transaction was included
+  // block_hash of the block in which the transaction was included
  string block_hash = 7 [(gogoproto.jsontag) = "blockHash"];
  // index of the log in the block
  uint64 index = 8 [(gogoproto.jsontag) = "logIndex"];

-  // The Removed field is true if this log was reverted due to a chain
+  // removed is true if this log was reverted due to a chain
  // reorganisation. You must pay attention to this field if you receive logs
  // through a filter query.
  bool removed = 9;
@ -191,9 +193,9 @@ message TxResult {
 message AccessTuple {
  option (gogoproto.goproto_getters) = false;

-  // hex formatted ethereum address
+  // address is a hex formatted ethereum address
  string address = 1;
-  // hex formatted hashes of the storage keys
+  // storage_keys are hex formatted hashes of the storage keys
  repeated string storage_keys = 2 [(gogoproto.jsontag) = "storageKeys"];
 }

@ -204,27 +206,27 @@ message TraceConfig {
  reserved 4, 7;
  reserved "disable_memory", "disable_return_data";

-  // custom javascript tracer
+  // tracer is a custom javascript tracer
  string tracer = 1;
-  // overrides the default timeout of 5 seconds for JavaScript-based tracing
+  // timeout overrides the default timeout of 5 seconds for JavaScript-based tracing
  // calls
  string timeout = 2;
-  // number of blocks the tracer is willing to go back
+  // reexec defines the number of blocks the tracer is willing to go back
  uint64 reexec = 3;
-  // disable stack capture
+  // disable_stack switches stack capture
  bool disable_stack = 5 [(gogoproto.jsontag) = "disableStack"];
-  // disable storage capture
+  // disable_storage switches storage capture
  bool disable_storage = 6 [(gogoproto.jsontag) = "disableStorage"];
-  // print output during capture end
+  // debug can be used to print output during capture end
  bool debug = 8;
-  // maximum length of output, but zero means unlimited
+  // limit defines the maximum length of output, but zero means unlimited
  int32 limit = 9;
-  // Chain overrides, can be used to execute a trace using future fork rules
+  // overrides can be used to execute a trace using future fork rules
  ChainConfig overrides = 10;
-  // enable memory capture
+  // enable_memory switches memory capture
  bool enable_memory = 11 [(gogoproto.jsontag) = "enableMemory"];
-  // enable return data capture
+  // enable_return_data switches the capture of return data
  bool enable_return_data = 12 [(gogoproto.jsontag) = "enableReturnData"];
-  // tracer config
+  // tracer_json_config configures the tracer using a JSON string
  string tracer_json_config = 13 [(gogoproto.jsontag) = "tracerConfig"];
 }
--- a/proto/ethermint/evm/v1/genesis.proto
+++ b/proto/ethermint/evm/v1/genesis.proto
@ -1,8 +1,8 @@
 syntax = "proto3";
 package ethermint.evm.v1;

-import "gogoproto/gogo.proto";
 import "ethermint/evm/v1/evm.proto";
+import "gogoproto/gogo.proto";

 option go_package = "github.com/evmos/ethermint/x/evm/types";

--- a/proto/ethermint/evm/v1/query.proto
+++ b/proto/ethermint/evm/v1/query.proto
@ -1,11 +1,11 @@
 syntax = "proto3";
 package ethermint.evm.v1;

-import "gogoproto/gogo.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "google/api/annotations.proto";
 import "ethermint/evm/v1/evm.proto";
 import "ethermint/evm/v1/tx.proto";
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";

 option go_package = "github.com/evmos/ethermint/x/evm/types";
@ -89,7 +89,7 @@ message QueryAccountRequest {
 message QueryAccountResponse {
  // balance is the balance of the EVM denomination.
  string balance = 1;
-  // code hash is the hex-formatted code bytes from the EOA.
+  // code_hash is the hex-formatted code bytes from the EOA.
  string code_hash = 2;
  // nonce is the account's sequence number.
  uint64 nonce = 3;
@ -112,7 +112,7 @@ message QueryCosmosAccountResponse {
  string cosmos_address = 1;
  // sequence is the account's sequence number.
  uint64 sequence = 2;
-  // account_number is the account numbert
+  // account_number is the account number
  uint64 account_number = 3;
 }

@ -157,7 +157,7 @@ message QueryStorageRequest {
  option (gogoproto.equal) = false;
  option (gogoproto.goproto_getters) = false;

-  /// address is the ethereum hex address to query the storage state for.
+  // address is the ethereum hex address to query the storage state for.
  string address = 1;

  // key defines the key of the storage state
@ -167,7 +167,7 @@ message QueryStorageRequest {
 // QueryStorageResponse is the response type for the Query/Storage RPC
 // method.
 message QueryStorageResponse {
-  // key defines the storage state value hash associated with the given key.
+  // value defines the storage state value hash associated with the given key.
  string value = 1;
 }

@ -198,7 +198,7 @@ message QueryTxLogsRequest {
  cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }

-// QueryTxLogs is the response type for the Query/TxLogs RPC method.
+// QueryTxLogsResponse is the response type for the Query/TxLogs RPC method.
 message QueryTxLogsResponse {
  // logs represents the ethereum logs generated from the given transaction.
  repeated Log logs = 1;
@ -217,72 +217,73 @@ message QueryParamsResponse {

 // EthCallRequest defines EthCall request
 message EthCallRequest {
-  // same json format as the json rpc api.
+  // args uses the same json format as the json rpc api.
  bytes args = 1;
-  // the default gas cap to be used
+  // gas_cap defines the default gas cap to be used
  uint64 gas_cap = 2;
-  // the proposer of the requested block
+  // proposer_address of the requested block in hex format
  bytes proposer_address = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
-  // the eip155 chain id parsed from the requested block header
+  // chain_id is the eip155 chain id parsed from the requested block header
  int64 chain_id = 4;
 }

 // EstimateGasResponse defines EstimateGas response
 message EstimateGasResponse {
-  // the estimated gas
+  // gas returns the estimated gas
  uint64 gas = 1;
 }

 // QueryTraceTxRequest defines TraceTx request
 message QueryTraceTxRequest {
-  // msgEthereumTx for the requested transaction
+  // msg is the MsgEthereumTx for the requested transaction
  MsgEthereumTx msg = 1;
  // tx_index is not necessary anymore
  reserved 2;
  reserved "tx_index";
-  // TraceConfig holds extra parameters to trace functions.
+  // trace_config holds extra parameters to trace functions.
  TraceConfig trace_config = 3;
-  // the predecessor transactions included in the same block
+  // predecessors is an array of transactions included in the same block
  // need to be replayed first to get correct context for tracing.
  repeated MsgEthereumTx predecessors = 4;
-  // block number of requested transaction
+  // block_number of requested transaction
  int64 block_number = 5;
-  // block hex hash of requested transaction
+  // block_hash of requested transaction
  string block_hash = 6;
-  // block time of requested transaction
+  // block_time of requested transaction
  google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
-  // the proposer of the requested block
+  // proposer_address is the proposer of the requested block
  bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
-  // the eip155 chain id parsed from the requested block header
+  // chain_id is the the eip155 chain id parsed from the requested block header
  int64 chain_id = 9;
 }

 // QueryTraceTxResponse defines TraceTx response
 message QueryTraceTxResponse {
-  // response serialized in bytes
+  // data is the response serialized in bytes
  bytes data = 1;
 }

 // QueryTraceBlockRequest defines TraceTx request
 message QueryTraceBlockRequest {
-  // txs messages in the block
+  // txs is an array of messages in the block
  repeated MsgEthereumTx txs = 1;
-  // TraceConfig holds extra parameters to trace functions.
+  // trace_config holds extra parameters to trace functions.
  TraceConfig trace_config = 3;
-  // block number
+  // block_number of the traced block
  int64 block_number = 5;
-  // block hex hash
+  // block_hash (hex) of the traced block
  string block_hash = 6;
-  // block time
+  // block_time of the traced block
  google.protobuf.Timestamp block_time = 7 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
-  // the proposer of the requested block
+  // proposer_address is the address of the requested block
  bytes proposer_address = 8 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ConsAddress"];
-  // the eip155 chain id parsed from the requested block header
+  // chain_id is the eip155 chain id parsed from the requested block header
  int64 chain_id = 9;
 }

 // QueryTraceBlockResponse defines TraceBlock response
 message QueryTraceBlockResponse {
+  // data is the response serialized in bytes
  bytes data = 1;
 }

@ -290,7 +291,8 @@ message QueryTraceBlockResponse {
 // fee.
 message QueryBaseFeeRequest {}

-// BaseFeeResponse returns the EIP1559 base fee.
+// QueryBaseFeeResponse returns the EIP1559 base fee.
 message QueryBaseFeeResponse {
+  // base_fee is the EIP1559 base fee
  string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
 }
--- a/proto/ethermint/evm/v1/tx.proto
+++ b/proto/ethermint/evm/v1/tx.proto
@ -1,11 +1,11 @@
 syntax = "proto3";
 package ethermint.evm.v1;

+import "cosmos_proto/cosmos.proto";
+import "ethermint/evm/v1/evm.proto";
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
-import "cosmos_proto/cosmos.proto";
-import "ethermint/evm/v1/evm.proto";

 option go_package = "github.com/evmos/ethermint/x/evm/types";

@ -21,15 +21,14 @@ service Msg {
 message MsgEthereumTx {
  option (gogoproto.goproto_getters) = false;

-  // inner transaction data
+  // data is inner transaction data of the Ethereum transaction
  google.protobuf.Any data = 1;
-  // caches

-  // DEPRECATED: encoded storage size of the transaction
+  // size is the encoded storage size of the transaction (DEPRECATED)
  double size = 2 [(gogoproto.jsontag) = "-"];
-  // transaction hash in hex format
+  // hash of the transaction in hex format
  string hash = 3 [(gogoproto.moretags) = "rlp:\"-\""];
-  // ethereum signer address in hex format. This address value is checked
+  // from is the ethereum signer address in hex format. This address value is checked
  // against the address derived from the signature (V, R, S) using the
  // secp256k1 elliptic curve
  string from = 4;
@ -44,16 +43,16 @@ message LegacyTx {

  // nonce corresponds to the account nonce (transaction sequence).
  uint64 nonce = 1;
-  // gas price defines the value for each gas unit
+  // gas_price defines the value for each gas unit
  string gas_price = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
  // gas defines the gas limit defined for the transaction.
  uint64 gas = 3 [(gogoproto.customname) = "GasLimit"];
-  // hex formatted address of the recipient
+  // to is the hex formatted address of the recipient
  string to = 4;
  // value defines the unsigned integer value of the transaction amount.
  string value = 5
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-  // input defines the data payload bytes of the transaction.
+  // data is the data payload bytes of the transaction.
  bytes data = 6;
  // v defines the signature value
  bytes v = 7;
@ -68,7 +67,7 @@ message AccessListTx {
  option (gogoproto.goproto_getters) = false;
  option (cosmos_proto.implements_interface) = "TxData";

-  // destination EVM chain ID
+  // chain_id of the destination EVM chain
  string chain_id = 1 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.customname) = "ChainID",
@ -76,17 +75,18 @@ message AccessListTx {
  ];
  // nonce corresponds to the account nonce (transaction sequence).
  uint64 nonce = 2;
-  // gas price defines the value for each gas unit
+  // gas_price defines the value for each gas unit
  string gas_price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
  // gas defines the gas limit defined for the transaction.
  uint64 gas = 4 [(gogoproto.customname) = "GasLimit"];
-  // hex formatted address of the recipient
+  // to is the recipient address in hex format
  string to = 5;
  // value defines the unsigned integer value of the transaction amount.
  string value = 6
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-  // input defines the data payload bytes of the transaction.
+  // data is the data payload bytes of the transaction.
  bytes data = 7;
+  // accesses is an array of access tuples
  repeated AccessTuple accesses = 8
      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
  // v defines the signature value
@ -102,7 +102,7 @@ message DynamicFeeTx {
  option (gogoproto.goproto_getters) = false;
  option (cosmos_proto.implements_interface) = "TxData";

-  // destination EVM chain ID
+  // chain_id of the destination EVM chain
  string chain_id = 1 [
    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
    (gogoproto.customname) = "ChainID",
@ -110,19 +110,20 @@ message DynamicFeeTx {
  ];
  // nonce corresponds to the account nonce (transaction sequence).
  uint64 nonce = 2;
-  // gas tip cap defines the max value for the gas tip
+  // gas_tip_cap defines the max value for the gas tip
  string gas_tip_cap = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
-  // gas fee cap defines the max value for the gas fee
+  // gas_fee_cap defines the max value for the gas fee
  string gas_fee_cap = 4 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
  // gas defines the gas limit defined for the transaction.
  uint64 gas = 5 [(gogoproto.customname) = "GasLimit"];
-  // hex formatted address of the recipient
+  // to is the hex formatted address of the recipient
  string to = 6;
  // value defines the the transaction amount.
  string value = 7
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.customname) = "Amount"];
-  // input defines the data payload bytes of the transaction.
+  // data is the data payload bytes of the transaction.
  bytes data = 8;
+  // accesses is an array of access tuples
  repeated AccessTuple accesses = 9
      [(gogoproto.castrepeated) = "AccessList", (gogoproto.jsontag) = "accessList", (gogoproto.nullable) = false];
  // v defines the signature value
@ -133,6 +134,7 @@ message DynamicFeeTx {
  bytes s = 12;
 }

+// ExtensionOptionsEthereumTx is an extension option for ethereum transactions
 message ExtensionOptionsEthereumTx {
  option (gogoproto.goproto_getters) = false;
 }
@ -141,18 +143,18 @@ message ExtensionOptionsEthereumTx {
 message MsgEthereumTxResponse {
  option (gogoproto.goproto_getters) = false;

-  // ethereum transaction hash in hex format. This hash differs from the
+  // hash of the ethereum transaction in hex format. This hash differs from the
  // Tendermint sha256 hash of the transaction bytes. See
  // https://github.com/tendermint/tendermint/issues/6539 for reference
  string hash = 1;
  // logs contains the transaction hash and the proto-compatible ethereum
  // logs.
  repeated Log logs = 2;
-  // returned data from evm function (result or data supplied with revert
+  // ret is the returned data from evm function (result or data supplied with revert
  // opcode)
  bytes ret = 3;
-  // vm error is the error returned by vm execution
+  // vm_error is the error returned by vm execution
  string vm_error = 4;
-  // gas consumed by the transaction
+  // gas_used specifies how much gas was consumed by the transaction
  uint64 gas_used = 5;
 }
--- a/proto/ethermint/feemarket/v1/feemarket.proto
+++ b/proto/ethermint/feemarket/v1/feemarket.proto
@ -7,26 +7,26 @@ option go_package = "github.com/evmos/ethermint/x/feemarket/types";

 // Params defines the EVM module parameters
 message Params {
-  // no base fee forces the EIP-1559 base fee to 0 (needed for 0 price calls)
+  // no_base_fee forces the EIP-1559 base fee to 0 (needed for 0 price calls)
  bool no_base_fee = 1;
-  // base fee change denominator bounds the amount the base fee can change
+  // base_fee_change_denominator bounds the amount the base fee can change
  // between blocks.
  uint32 base_fee_change_denominator = 2;
-  // elasticity multiplier bounds the maximum gas limit an EIP-1559 block may
+  // elasticity_multiplier bounds the maximum gas limit an EIP-1559 block may
  // have.
  uint32 elasticity_multiplier = 3;
  // DEPRECATED: initial base fee for EIP-1559 blocks.
  reserved 4;
  reserved "initial_base_fee";
-  // height at which the base fee calculation is enabled.
+  // enable_height defines at which block height the base fee calculation is enabled.
  int64 enable_height = 5;
-  // base fee for EIP-1559 blocks.
+  // base_fee for EIP-1559 blocks.
  string base_fee = 6 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
  // min_gas_price defines the minimum gas price value for cosmos and eth transactions
  string min_gas_price = 7
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
-  // min gas denominator bounds the minimum gasUsed to be charged
-  // to senders based on GasLimit
+  // min_gas_multiplier bounds the minimum gas used to be charged
+  // to senders based on gas limit
  string min_gas_multiplier = 8
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
--- a/proto/ethermint/feemarket/v1/genesis.proto
+++ b/proto/ethermint/feemarket/v1/genesis.proto
@ -1,20 +1,20 @@
 syntax = "proto3";
 package ethermint.feemarket.v1;

-import "gogoproto/gogo.proto";
 import "ethermint/feemarket/v1/feemarket.proto";
+import "gogoproto/gogo.proto";

 option go_package = "github.com/evmos/ethermint/x/feemarket/types";

 // GenesisState defines the feemarket module's genesis state.
 message GenesisState {
-  // params defines all the paramaters of the module.
+  // params defines all the parameters of the feemarket module.
  Params params = 1 [(gogoproto.nullable) = false];
  // DEPRECATED: base fee is the exported value from previous software version.
  // Zero by default.
  reserved 2;
  reserved "base_fee";
-  // block gas is the amount of gas wanted on the last block before the upgrade.
+  // block_gas is the amount of gas wanted on the last block before the upgrade.
  // Zero by default.
  uint64 block_gas = 3;
 }
--- a/proto/ethermint/feemarket/v1/query.proto
+++ b/proto/ethermint/feemarket/v1/query.proto
@ -3,8 +3,8 @@ package ethermint.feemarket.v1;

 import "gogoproto/gogo.proto";
 // import "cosmos/base/query/v1beta1/pagination.proto";
-import "google/api/annotations.proto";
 import "ethermint/feemarket/v1/feemarket.proto";
+import "google/api/annotations.proto";

 option go_package = "github.com/evmos/ethermint/x/feemarket/types";

@ -39,8 +39,9 @@ message QueryParamsResponse {
 // fee.
 message QueryBaseFeeRequest {}

-// BaseFeeResponse returns the EIP1559 base fee.
+// QueryBaseFeeResponse returns the EIP1559 base fee.
 message QueryBaseFeeResponse {
+  // base_fee is the EIP1559 base fee
  string base_fee = 1 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"];
 }

@ -50,5 +51,6 @@ message QueryBlockGasRequest {}

 // QueryBlockGasResponse returns block gas used for a given height.
 message QueryBlockGasResponse {
+  // gas is the returned block gas
  int64 gas = 1;
 }
--- a/proto/ethermint/types/v1/account.proto
+++ b/proto/ethermint/types/v1/account.proto
@ -16,7 +16,10 @@ message EthAccount {

  option (cosmos_proto.implements_interface) = "github.com/cosmos/cosmos-sdk/x/auth/types.AccountI";

+  // base_account is an authtypes.BaseAccount
  cosmos.auth.v1beta1.BaseAccount base_account = 1
      [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""];
+
+  // code_hash is the hash calculated from the code contents
  string code_hash = 2 [(gogoproto.moretags) = "yaml:\"code_hash\""];
 }
--- a/proto/ethermint/types/v1/dynamic_fee.proto
+++ b/proto/ethermint/types/v1/dynamic_fee.proto
@ -5,9 +5,9 @@ import "gogoproto/gogo.proto";

 option go_package = "github.com/evmos/ethermint/types";

-// ExtensionOptionDynamicFeeTx is an extension option that specify the maxPrioPrice for cosmos tx
+// ExtensionOptionDynamicFeeTx is an extension option that specifies the maxPrioPrice for cosmos tx
 message ExtensionOptionDynamicFeeTx {
-  // the same as `max_priority_fee_per_gas` in eip-1559 spec
+  // max_priority_price is the same as `max_priority_fee_per_gas` in eip-1559 spec
  string max_priority_price = 1
      [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false];
 }
--- a/proto/ethermint/types/v1/indexer.proto
+++ b/proto/ethermint/types/v1/indexer.proto
@ -9,21 +9,22 @@ option go_package = "github.com/evmos/ethermint/types";
 message TxResult {
  option (gogoproto.goproto_getters) = false;

-  // the block height
+  // height of the blockchain
  int64 height = 1;
-  // cosmos tx index
+  // tx_index of the cosmos transaction
  uint32 tx_index = 2;
-  // the msg index in a batch tx
+  // msg_index in a batch transaction
  uint32 msg_index = 3;

-  // eth tx index, the index in the list of valid eth tx in the block,
+  // eth_tx_index is the index in the list of valid eth tx in the block,
  // aka. the transaction list returned by eth_getBlock api.
  int32 eth_tx_index = 4;
-  // if the eth tx is failed
+  // failed is true if the eth transaction did not go succeed
  bool failed = 5;
-  // gas used by tx, if exceeds block gas limit,
-  // it's set to gas limit which is what's actually deducted by ante handler.
+  // gas_used by the transaction. If it exceeds the block gas limit,
+  // it's set to gas limit, which is what's actually deducted by ante handler.
  uint64 gas_used = 6;
-  // the cumulative gas used within current batch tx
+  // cumulative_gas_used specifies the cumulated amount of gas used for all
+  // processed messages within the current batch transaction.
  uint64 cumulative_gas_used = 7;
 }
--- a/proto/ethermint/types/v1/web3.proto
+++ b/proto/ethermint/types/v1/web3.proto
@ -5,19 +5,21 @@ import "gogoproto/gogo.proto";

 option go_package = "github.com/evmos/ethermint/types";

+// ExtensionOptionsWeb3Tx is an extension option that specifies the typed chain id,
+// the fee payer as well as its signature data.
 message ExtensionOptionsWeb3Tx {
  option (gogoproto.goproto_getters) = false;

-  // typed data chain id used only in EIP712 Domain and should match
+  // typed_data_chain_id is used only in EIP712 Domain and should match
  // Ethereum network ID in a Web3 provider (e.g. Metamask).
  uint64 typed_data_chain_id = 1
      [(gogoproto.jsontag) = "typedDataChainID,omitempty", (gogoproto.customname) = "TypedDataChainID"];

-  // fee payer is an account address for the fee payer. It will be validated
+  // fee_payer is an account address for the fee payer. It will be validated
  // during EIP712 signature checking.
  string fee_payer = 2 [(gogoproto.jsontag) = "feePayer,omitempty"];

-  // fee payer sig is a signature data from the fee paying account,
+  // fee_payer_sig is a signature data from the fee paying account,
  // allows to perform fee delegation when using EIP712 Domain.
  bytes fee_payer_sig = 3 [(gogoproto.jsontag) = "feePayerSig,omitempty"];
 }
--- a/scripts/protocgen.sh
+++ b/scripts/protocgen.sh
@ -9,9 +9,11 @@ set -eo pipefail
 echo "Generating gogo proto code"
 proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
-  for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do
-    if grep go_package $file &>/dev/null; then
-      buf generate --template proto/buf.gen.gogo.yaml $file
+  proto_files=$(find "${dir}" -maxdepth 1 -name '*.proto')
+  for file in $proto_files; do
+    # Check if the go_package in the file is pointing to evmos
+    if grep -q "option go_package.*ethermint" "$file"; then
+      buf generate --template proto/buf.gen.gogo.yaml "$file"
    fi
  done
 done
--- a/types/account.pb.go
+++ b/types/account.pb.go
@ -28,7 +28,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 // EthAccount implements the authtypes.AccountI interface and embeds an
 // authtypes.BaseAccount type. It is compatible with the auth AccountKeeper.
 type EthAccount struct {
+	// base_account is an authtypes.BaseAccount
 	*types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"`
+	// code_hash is the hash calculated from the code contents
 	CodeHash string `protobuf:"bytes,2,opt,name=code_hash,json=codeHash,proto3" json:"code_hash,omitempty" yaml:"code_hash"`
 }

--- a/types/dynamic_fee.pb.go
+++ b/types/dynamic_fee.pb.go
@ -24,9 +24,9 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

-// ExtensionOptionDynamicFeeTx is an extension option that specify the maxPrioPrice for cosmos tx
+// ExtensionOptionDynamicFeeTx is an extension option that specifies the maxPrioPrice for cosmos tx
 type ExtensionOptionDynamicFeeTx struct {
-	// the same as `max_priority_fee_per_gas` in eip-1559 spec
+	// max_priority_price is the same as `max_priority_fee_per_gas` in eip-1559 spec
 	MaxPriorityPrice github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=max_priority_price,json=maxPriorityPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_priority_price"`
 }

--- a/types/indexer.pb.go
+++ b/types/indexer.pb.go
@ -25,21 +25,22 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

 // TxResult is the value stored in eth tx indexer
 type TxResult struct {
-	// the block height
+	// height of the blockchain
 	Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
-	// cosmos tx index
+	// tx_index of the cosmos transaction
 	TxIndex uint32 `protobuf:"varint,2,opt,name=tx_index,json=txIndex,proto3" json:"tx_index,omitempty"`
-	// the msg index in a batch tx
+	// msg_index in a batch transaction
 	MsgIndex uint32 `protobuf:"varint,3,opt,name=msg_index,json=msgIndex,proto3" json:"msg_index,omitempty"`
-	// eth tx index, the index in the list of valid eth tx in the block,
+	// eth_tx_index is the index in the list of valid eth tx in the block,
 	// aka. the transaction list returned by eth_getBlock api.
 	EthTxIndex int32 `protobuf:"varint,4,opt,name=eth_tx_index,json=ethTxIndex,proto3" json:"eth_tx_index,omitempty"`
-	// if the eth tx is failed
+	// failed is true if the eth transaction did not go succeed
 	Failed bool `protobuf:"varint,5,opt,name=failed,proto3" json:"failed,omitempty"`
-	// gas used by tx, if exceeds block gas limit,
-	// it's set to gas limit which is what's actually deducted by ante handler.
+	// gas_used by the transaction. If it exceeds the block gas limit,
+	// it's set to gas limit, which is what's actually deducted by ante handler.
 	GasUsed uint64 `protobuf:"varint,6,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"`
-	// the cumulative gas used within current batch tx
+	// cumulative_gas_used specifies the cumulated amount of gas used for all
+	// processed messages within the current batch transaction.
 	CumulativeGasUsed uint64 `protobuf:"varint,7,opt,name=cumulative_gas_used,json=cumulativeGasUsed,proto3" json:"cumulative_gas_used,omitempty"`
 }

--- a/types/web3.pb.go
+++ b/types/web3.pb.go
@ -23,14 +23,16 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

+// ExtensionOptionsWeb3Tx is an extension option that specifies the typed chain id,
+// the fee payer as well as its signature data.
 type ExtensionOptionsWeb3Tx struct {
-	// typed data chain id used only in EIP712 Domain and should match
+	// typed_data_chain_id is used only in EIP712 Domain and should match
 	// Ethereum network ID in a Web3 provider (e.g. Metamask).
 	TypedDataChainID uint64 `protobuf:"varint,1,opt,name=typed_data_chain_id,json=typedDataChainId,proto3" json:"typedDataChainID,omitempty"`
-	// fee payer is an account address for the fee payer. It will be validated
+	// fee_payer is an account address for the fee payer. It will be validated
 	// during EIP712 signature checking.
 	FeePayer string `protobuf:"bytes,2,opt,name=fee_payer,json=feePayer,proto3" json:"feePayer,omitempty"`
-	// fee payer sig is a signature data from the fee paying account,
+	// fee_payer_sig is a signature data from the fee paying account,
 	// allows to perform fee delegation when using EIP712 Domain.
 	FeePayerSig []byte `protobuf:"bytes,3,opt,name=fee_payer_sig,json=feePayerSig,proto3" json:"feePayerSig,omitempty"`
 }
--- a/x/evm/types/evm.pb.go
+++ b/x/evm/types/evm.pb.go
@ -26,18 +26,18 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

 // Params defines the EVM module parameters
 type Params struct {
-	// evm denom represents the token denomination used to run the EVM state
+	// evm_denom represents the token denomination used to run the EVM state
 	// transitions.
 	EvmDenom string `protobuf:"bytes,1,opt,name=evm_denom,json=evmDenom,proto3" json:"evm_denom,omitempty" yaml:"evm_denom"`
-	// enable create toggles state transitions that use the vm.Create function
+	// enable_create toggles state transitions that use the vm.Create function
 	EnableCreate bool `protobuf:"varint,2,opt,name=enable_create,json=enableCreate,proto3" json:"enable_create,omitempty" yaml:"enable_create"`
-	// enable call toggles state transitions that use the vm.Call function
+	// enable_call toggles state transitions that use the vm.Call function
 	EnableCall bool `protobuf:"varint,3,opt,name=enable_call,json=enableCall,proto3" json:"enable_call,omitempty" yaml:"enable_call"`
-	// extra eips defines the additional EIPs for the vm.Config
+	// extra_eips defines the additional EIPs for the vm.Config
 	ExtraEIPs []int64 `protobuf:"varint,4,rep,packed,name=extra_eips,json=extraEips,proto3" json:"extra_eips,omitempty" yaml:"extra_eips"`
-	// chain config defines the EVM chain configuration parameters
+	// chain_config defines the EVM chain configuration parameters
 	ChainConfig ChainConfig `protobuf:"bytes,5,opt,name=chain_config,json=chainConfig,proto3" json:"chain_config" yaml:"chain_config"`
-	// Allow unprotected transactions defines if replay-protected (i.e non EIP155
+	// allow_unprotected_txs defines if replay-protected (i.e non EIP155
 	// signed) transactions can be executed on the state machine.
 	AllowUnprotectedTxs bool `protobuf:"varint,6,opt,name=allow_unprotected_txs,json=allowUnprotectedTxs,proto3" json:"allow_unprotected_txs,omitempty"`
 }
@ -120,40 +120,40 @@ func (m *Params) GetAllowUnprotectedTxs() bool {
 // ChainConfig defines the Ethereum ChainConfig parameters using *sdk.Int values
 // instead of *big.Int.
 type ChainConfig struct {
-	// Homestead switch block (nil no fork, 0 = already homestead)
+	// homestead_block switch (nil no fork, 0 = already homestead)
 	HomesteadBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=homestead_block,json=homesteadBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"homestead_block,omitempty" yaml:"homestead_block"`
-	// TheDAO hard-fork switch block (nil no fork)
+	// dao_fork_block corresponds to TheDAO hard-fork switch block (nil no fork)
 	DAOForkBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=dao_fork_block,json=daoForkBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"dao_fork_block,omitempty" yaml:"dao_fork_block"`
-	// Whether the nodes supports or opposes the DAO hard-fork
+	// dao_fork_support defines whether the nodes supports or opposes the DAO hard-fork
 	DAOForkSupport bool `protobuf:"varint,3,opt,name=dao_fork_support,json=daoForkSupport,proto3" json:"dao_fork_support,omitempty" yaml:"dao_fork_support"`
-	// EIP150 implements the Gas price changes
+	// eip150_block: EIP150 implements the Gas price changes
 	// (https://github.com/ethereum/EIPs/issues/150) EIP150 HF block (nil no fork)
 	EIP150Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=eip150_block,json=eip150Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip150_block,omitempty" yaml:"eip150_block"`
-	// EIP150 HF hash (needed for header only clients as only gas pricing changed)
+	// eip150_hash: EIP150 HF hash (needed for header only clients as only gas pricing changed)
 	EIP150Hash string `protobuf:"bytes,5,opt,name=eip150_hash,json=eip150Hash,proto3" json:"eip150_hash,omitempty" yaml:"byzantium_block"`
-	// EIP155Block HF block
+	// eip155_block: EIP155Block HF block
 	EIP155Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=eip155_block,json=eip155Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip155_block,omitempty" yaml:"eip155_block"`
-	// EIP158 HF block
+	// eip158_block: EIP158 HF block
 	EIP158Block *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=eip158_block,json=eip158Block,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"eip158_block,omitempty" yaml:"eip158_block"`
-	// Byzantium switch block (nil no fork, 0 = already on byzantium)
+	// byzantium_block: Byzantium switch block (nil no fork, 0 = already on byzantium)
 	ByzantiumBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,8,opt,name=byzantium_block,json=byzantiumBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"byzantium_block,omitempty" yaml:"byzantium_block"`
-	// Constantinople switch block (nil no fork, 0 = already activated)
+	// constantinople_block: Constantinople switch block (nil no fork, 0 = already activated)
 	ConstantinopleBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,9,opt,name=constantinople_block,json=constantinopleBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"constantinople_block,omitempty" yaml:"constantinople_block"`
-	// Petersburg switch block (nil same as Constantinople)
+	// petersburg_block: Petersburg switch block (nil same as Constantinople)
 	PetersburgBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,10,opt,name=petersburg_block,json=petersburgBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"petersburg_block,omitempty" yaml:"petersburg_block"`
-	// Istanbul switch block (nil no fork, 0 = already on istanbul)
+	// istanbul_block: Istanbul switch block (nil no fork, 0 = already on istanbul)
 	IstanbulBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=istanbul_block,json=istanbulBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"istanbul_block,omitempty" yaml:"istanbul_block"`
-	// Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
+	// muir_glacier_block: Eip-2384 (bomb delay) switch block (nil no fork, 0 = already activated)
 	MuirGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,12,opt,name=muir_glacier_block,json=muirGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"muir_glacier_block,omitempty" yaml:"muir_glacier_block"`
-	// Berlin switch block (nil = no fork, 0 = already on berlin)
+	// berlin_block: Berlin switch block (nil = no fork, 0 = already on berlin)
 	BerlinBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,13,opt,name=berlin_block,json=berlinBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"berlin_block,omitempty" yaml:"berlin_block"`
-	// London switch block (nil = no fork, 0 = already on london)
+	// london_block: London switch block (nil = no fork, 0 = already on london)
 	LondonBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,17,opt,name=london_block,json=londonBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"london_block,omitempty" yaml:"london_block"`
-	// Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
+	// arrow_glacier_block: Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated)
 	ArrowGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,18,opt,name=arrow_glacier_block,json=arrowGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"arrow_glacier_block,omitempty" yaml:"arrow_glacier_block"`
-	//  EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated)
+	// gray_glacier_block: EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated)
 	GrayGlacierBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,20,opt,name=gray_glacier_block,json=grayGlacierBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"gray_glacier_block,omitempty" yaml:"gray_glacier_block"`
-	// Virtual fork after The Merge to use as a network splitter
+	// merge_netsplit_block: Virtual fork after The Merge to use as a network splitter
 	MergeNetsplitBlock *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,21,opt,name=merge_netsplit_block,json=mergeNetsplitBlock,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"merge_netsplit_block,omitempty" yaml:"merge_netsplit_block"`
 }

@ -206,7 +206,9 @@ func (m *ChainConfig) GetEIP150Hash() string {

 // State represents a single Storage key value pair item.
 type State struct {
+	// key is the stored key
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	// value is the stored value for the given key
 	Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 }

@ -261,7 +263,9 @@ func (m *State) GetValue() string {
 // with a given hash. It it used for import/export data as transactions are not
 // persisted on blockchain state after an upgrade.
 type TransactionLogs struct {
+	// hash of the transaction
 	Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
+	// logs is an array of Logs for the given transaction hash
 	Logs []*Log `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"`
 }

@ -315,24 +319,27 @@ func (m *TransactionLogs) GetLogs() []*Log {
 // Log represents an protobuf compatible Ethereum Log that defines a contract
 // log event. These events are generated by the LOG opcode and stored/indexed by
 // the node.
+//
+// NOTE: address, topics and data are consensus fields. The rest of the fields
+// are derived, i.e. filled in by the nodes, but not secured by consensus.
 type Log struct {
 	// address of the contract that generated the event
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// list of topics provided by the contract.
+	// topics is a list of topics provided by the contract.
 	Topics []string `protobuf:"bytes,2,rep,name=topics,proto3" json:"topics,omitempty"`
-	// supplied by the contract, usually ABI-encoded
+	// data which is supplied by the contract, usually ABI-encoded
 	Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
-	// block in which the transaction was included
+	// block_number of the block in which the transaction was included
 	BlockNumber uint64 `protobuf:"varint,4,opt,name=block_number,json=blockNumber,proto3" json:"blockNumber"`
-	// hash of the transaction
+	// tx_hash is the transaction hash
 	TxHash string `protobuf:"bytes,5,opt,name=tx_hash,json=txHash,proto3" json:"transactionHash"`
-	// index of the transaction in the block
+	// tx_index of the transaction in the block
 	TxIndex uint64 `protobuf:"varint,6,opt,name=tx_index,json=txIndex,proto3" json:"transactionIndex"`
-	// hash of the block in which the transaction was included
+	// block_hash of the block in which the transaction was included
 	BlockHash string `protobuf:"bytes,7,opt,name=block_hash,json=blockHash,proto3" json:"blockHash"`
 	// index of the log in the block
 	Index uint64 `protobuf:"varint,8,opt,name=index,proto3" json:"logIndex"`
-	// The Removed field is true if this log was reverted due to a chain
+	// removed is true if this log was reverted due to a chain
 	// reorganisation. You must pay attention to this field if you receive logs
 	// through a filter query.
 	Removed bool `protobuf:"varint,9,opt,name=removed,proto3" json:"removed,omitempty"`
@ -488,9 +495,9 @@ var xxx_messageInfo_TxResult proto.InternalMessageInfo

 // AccessTuple is the element type of an access list.
 type AccessTuple struct {
-	// hex formatted ethereum address
+	// address is a hex formatted ethereum address
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// hex formatted hashes of the storage keys
+	// storage_keys are hex formatted hashes of the storage keys
 	StorageKeys []string `protobuf:"bytes,2,rep,name=storage_keys,json=storageKeys,proto3" json:"storageKeys"`
 }

@ -529,28 +536,28 @@ var xxx_messageInfo_AccessTuple proto.InternalMessageInfo

 // TraceConfig holds extra parameters to trace functions.
 type TraceConfig struct {
-	// custom javascript tracer
+	// tracer is a custom javascript tracer
 	Tracer string `protobuf:"bytes,1,opt,name=tracer,proto3" json:"tracer,omitempty"`
-	// overrides the default timeout of 5 seconds for JavaScript-based tracing
+	// timeout overrides the default timeout of 5 seconds for JavaScript-based tracing
 	// calls
 	Timeout string `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
-	// number of blocks the tracer is willing to go back
+	// reexec defines the number of blocks the tracer is willing to go back
 	Reexec uint64 `protobuf:"varint,3,opt,name=reexec,proto3" json:"reexec,omitempty"`
-	// disable stack capture
+	// disable_stack switches stack capture
 	DisableStack bool `protobuf:"varint,5,opt,name=disable_stack,json=disableStack,proto3" json:"disableStack"`
-	// disable storage capture
+	// disable_storage switches storage capture
 	DisableStorage bool `protobuf:"varint,6,opt,name=disable_storage,json=disableStorage,proto3" json:"disableStorage"`
-	// print output during capture end
+	// debug can be used to print output during capture end
 	Debug bool `protobuf:"varint,8,opt,name=debug,proto3" json:"debug,omitempty"`
-	// maximum length of output, but zero means unlimited
+	// limit defines the maximum length of output, but zero means unlimited
 	Limit int32 `protobuf:"varint,9,opt,name=limit,proto3" json:"limit,omitempty"`
-	// Chain overrides, can be used to execute a trace using future fork rules
+	// overrides can be used to execute a trace using future fork rules
 	Overrides *ChainConfig `protobuf:"bytes,10,opt,name=overrides,proto3" json:"overrides,omitempty"`
-	// enable memory capture
+	// enable_memory switches memory capture
 	EnableMemory bool `protobuf:"varint,11,opt,name=enable_memory,json=enableMemory,proto3" json:"enableMemory"`
-	// enable return data capture
+	// enable_return_data switches the capture of return data
 	EnableReturnData bool `protobuf:"varint,12,opt,name=enable_return_data,json=enableReturnData,proto3" json:"enableReturnData"`
-	// tracer config
+	// tracer_json_config configures the tracer using a JSON string
 	TracerJsonConfig string `protobuf:"bytes,13,opt,name=tracer_json_config,json=tracerJsonConfig,proto3" json:"tracerConfig"`
 }

--- a/x/evm/types/genesis.pb.go
+++ b/x/evm/types/genesis.pb.go
@ -154,24 +154,24 @@ func init() { proto.RegisterFile("ethermint/evm/v1/genesis.proto", fileDescripto
 var fileDescriptor_9bcdec50cc9d156d = []byte{
 	// 297 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x50, 0xbf, 0x4e, 0x83, 0x40,
-	0x18, 0xe7, 0x6c, 0x53, 0xec, 0xd5, 0xa8, 0xb9, 0x98, 0x48, 0x18, 0xae, 0xa4, 0x83, 0x61, 0x3a,
-	0xd2, 0x9a, 0x38, 0x2b, 0x8b, 0xab, 0xa1, 0x9b, 0xdb, 0x15, 0xbe, 0x50, 0x06, 0x38, 0xc2, 0x5d,
-	0x89, 0xae, 0x8e, 0x4e, 0x3e, 0x87, 0x4f, 0xd2, 0xb1, 0xa3, 0x93, 0x1a, 0x78, 0x11, 0xc3, 0x41,
-	0x6b, 0x94, 0xed, 0xbb, 0xfc, 0xfe, 0xde, 0x0f, 0x53, 0x50, 0x6b, 0x28, 0xd2, 0x24, 0x53, 0x1e,
-	0x94, 0xa9, 0x57, 0xce, 0xbd, 0x18, 0x32, 0x90, 0x89, 0x64, 0x79, 0x21, 0x94, 0x20, 0xe7, 0x07,
-	0x9c, 0x41, 0x99, 0xb2, 0x72, 0x6e, 0x5f, 0xc4, 0x22, 0x16, 0x1a, 0xf4, 0x9a, 0xab, 0xe5, 0xd9,
-	0x76, 0xcf, 0xa7, 0xa1, 0x6b, 0x6c, 0xf6, 0x8a, 0xf0, 0xc9, 0x7d, 0xeb, 0xba, 0x54, 0x5c, 0x01,
-	0xf1, 0xf1, 0x31, 0x0f, 0x43, 0xb1, 0xc9, 0x94, 0xb4, 0x90, 0x33, 0x70, 0x27, 0x0b, 0x87, 0xfd,
-	0xcf, 0x61, 0x9d, 0xe2, 0xae, 0x25, 0xfa, 0xc3, 0xed, 0xe7, 0xd4, 0x08, 0x0e, 0x3a, 0x72, 0x83,
-	0x47, 0x39, 0x2f, 0x78, 0x2a, 0xad, 0x23, 0x07, 0xb9, 0x93, 0x85, 0xd5, 0x77, 0x78, 0xd0, 0x78,
-	0xa7, 0xec, 0xd8, 0xb3, 0x17, 0x84, 0x4f, 0xff, 0x5a, 0x13, 0x0b, 0x9b, 0x3c, 0x8a, 0x0a, 0x90,
-	0x4d, 0x1b, 0xe4, 0x8e, 0x83, 0xfd, 0x93, 0x10, 0x3c, 0x0c, 0x45, 0x04, 0x3a, 0x62, 0x1c, 0xe8,
-	0x9b, 0xf8, 0xd8, 0x94, 0x4a, 0x14, 0x3c, 0x06, 0x6b, 0xa0, 0xbb, 0x5f, 0xf6, 0x93, 0xf5, 0x37,
-	0xfd, 0xb3, 0x26, 0xf8, 0xfd, 0x6b, 0x6a, 0x2e, 0x5b, 0x7e, 0xb0, 0x17, 0xfa, 0xb7, 0xdb, 0x8a,
-	0xa2, 0x5d, 0x45, 0xd1, 0x77, 0x45, 0xd1, 0x5b, 0x4d, 0x8d, 0x5d, 0x4d, 0x8d, 0x8f, 0x9a, 0x1a,
-	0x8f, 0x57, 0x71, 0xa2, 0xd6, 0x9b, 0x15, 0x0b, 0x45, 0xda, 0x2c, 0x28, 0xa4, 0xf7, 0x3b, 0xec,
-	0x93, 0x9e, 0x56, 0x3d, 0xe7, 0x20, 0x57, 0x23, 0x3d, 0xed, 0xf5, 0x4f, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x0a, 0xad, 0x92, 0x3a, 0xc0, 0x01, 0x00, 0x00,
+	0x1c, 0xe6, 0x6c, 0x53, 0xec, 0xd5, 0xa8, 0xb9, 0x98, 0x48, 0x18, 0xae, 0xa4, 0x83, 0x61, 0x3a,
+	0xd2, 0x9a, 0x38, 0x2b, 0x8b, 0xab, 0xa1, 0x9b, 0xdb, 0x15, 0x7e, 0xa1, 0x0c, 0x70, 0x84, 0xbb,
+	0x12, 0x5d, 0x1d, 0x9d, 0x7c, 0x0e, 0x9f, 0xa4, 0x63, 0x47, 0x27, 0x35, 0xf0, 0x22, 0x86, 0x83,
+	0xd6, 0x28, 0xdb, 0x07, 0xdf, 0xbf, 0xdf, 0x7d, 0x98, 0x82, 0x5a, 0x43, 0x91, 0x26, 0x99, 0xf2,
+	0xa0, 0x4c, 0xbd, 0x72, 0xee, 0xc5, 0x90, 0x81, 0x4c, 0x24, 0xcb, 0x0b, 0xa1, 0x04, 0x39, 0x3f,
+	0xf0, 0x0c, 0xca, 0x94, 0x95, 0x73, 0xdb, 0xee, 0x39, 0x1a, 0x42, 0xab, 0xed, 0x8b, 0x58, 0xc4,
+	0x42, 0x43, 0xaf, 0x41, 0xed, 0xdf, 0xd9, 0x2b, 0xc2, 0x27, 0xf7, 0x6d, 0xea, 0x52, 0x71, 0x05,
+	0xc4, 0xc7, 0xc7, 0x3c, 0x0c, 0xc5, 0x26, 0x53, 0xd2, 0x42, 0xce, 0xc0, 0x9d, 0x2c, 0x1c, 0xf6,
+	0xbf, 0x87, 0x75, 0x8e, 0xbb, 0x56, 0xe8, 0x0f, 0xb7, 0x9f, 0x53, 0x23, 0x38, 0xf8, 0xc8, 0x0d,
+	0x1e, 0xe5, 0xbc, 0xe0, 0xa9, 0xb4, 0x8e, 0x1c, 0xe4, 0x4e, 0x16, 0x56, 0x3f, 0xe1, 0x41, 0xf3,
+	0x9d, 0xb3, 0x53, 0xcf, 0x5e, 0x10, 0x3e, 0xfd, 0x1b, 0x4d, 0x2c, 0x6c, 0xf2, 0x28, 0x2a, 0x40,
+	0x36, 0xd7, 0x20, 0x77, 0x1c, 0xec, 0x3f, 0x09, 0xc1, 0xc3, 0x50, 0x44, 0xa0, 0x2b, 0xc6, 0x81,
+	0xc6, 0xc4, 0xc7, 0xa6, 0x54, 0xa2, 0xe0, 0x31, 0x58, 0x03, 0x7d, 0xfb, 0x65, 0xbf, 0x59, 0x3f,
+	0xd3, 0x3f, 0x6b, 0x8a, 0xdf, 0xbf, 0xa6, 0xe6, 0xb2, 0xd5, 0x07, 0x7b, 0xa3, 0x7f, 0xbb, 0xad,
+	0x28, 0xda, 0x55, 0x14, 0x7d, 0x57, 0x14, 0xbd, 0xd5, 0xd4, 0xd8, 0xd5, 0xd4, 0xf8, 0xa8, 0xa9,
+	0xf1, 0x78, 0x15, 0x27, 0x6a, 0xbd, 0x59, 0xb1, 0x50, 0xa4, 0xcd, 0xae, 0x42, 0x7a, 0xbf, 0x73,
+	0x3f, 0xe9, 0xc1, 0xd5, 0x73, 0x0e, 0x72, 0x35, 0xd2, 0xd3, 0x5e, 0xff, 0x04, 0x00, 0x00, 0xff,
+	0xff, 0xe3, 0x61, 0xf0, 0x9f, 0xc0, 0x01, 0x00, 0x00,
 }

 func (m *GenesisState) Marshal() (dAtA []byte, err error) {
--- a/x/evm/types/query.pb.go
+++ b/x/evm/types/query.pb.go
@ -78,7 +78,7 @@ var xxx_messageInfo_QueryAccountRequest proto.InternalMessageInfo
 type QueryAccountResponse struct {
 	// balance is the balance of the EVM denomination.
 	Balance string `protobuf:"bytes,1,opt,name=balance,proto3" json:"balance,omitempty"`
-	// code hash is the hex-formatted code bytes from the EOA.
+	// code_hash is the hex-formatted code bytes from the EOA.
 	CodeHash string `protobuf:"bytes,2,opt,name=code_hash,json=codeHash,proto3" json:"code_hash,omitempty"`
 	// nonce is the account's sequence number.
 	Nonce uint64 `protobuf:"varint,3,opt,name=nonce,proto3" json:"nonce,omitempty"`
@ -185,7 +185,7 @@ type QueryCosmosAccountResponse struct {
 	CosmosAddress string `protobuf:"bytes,1,opt,name=cosmos_address,json=cosmosAddress,proto3" json:"cosmos_address,omitempty"`
 	// sequence is the account's sequence number.
 	Sequence uint64 `protobuf:"varint,2,opt,name=sequence,proto3" json:"sequence,omitempty"`
-	// account_number is the account numbert
+	// account_number is the account number
 	AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"`
 }

@ -435,7 +435,7 @@ func (m *QueryBalanceResponse) GetBalance() string {

 // QueryStorageRequest is the request type for the Query/Storage RPC method.
 type QueryStorageRequest struct {
-	/// address is the ethereum hex address to query the storage state for.
+	// address is the ethereum hex address to query the storage state for.
 	Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
 	// key defines the key of the storage state
 	Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
@ -477,7 +477,7 @@ var xxx_messageInfo_QueryStorageRequest proto.InternalMessageInfo
 // QueryStorageResponse is the response type for the Query/Storage RPC
 // method.
 type QueryStorageResponse struct {
-	// key defines the storage state value hash associated with the given key.
+	// value defines the storage state value hash associated with the given key.
 	Value string `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
 }

@ -648,7 +648,7 @@ func (m *QueryTxLogsRequest) XXX_DiscardUnknown() {

 var xxx_messageInfo_QueryTxLogsRequest proto.InternalMessageInfo

-// QueryTxLogs is the response type for the Query/TxLogs RPC method.
+// QueryTxLogsResponse is the response type for the Query/TxLogs RPC method.
 type QueryTxLogsResponse struct {
 	// logs represents the ethereum logs generated from the given transaction.
 	Logs []*Log `protobuf:"bytes,1,rep,name=logs,proto3" json:"logs,omitempty"`
@ -788,13 +788,13 @@ func (m *QueryParamsResponse) GetParams() Params {

 // EthCallRequest defines EthCall request
 type EthCallRequest struct {
-	// same json format as the json rpc api.
+	// args uses the same json format as the json rpc api.
 	Args []byte `protobuf:"bytes,1,opt,name=args,proto3" json:"args,omitempty"`
-	// the default gas cap to be used
+	// gas_cap defines the default gas cap to be used
 	GasCap uint64 `protobuf:"varint,2,opt,name=gas_cap,json=gasCap,proto3" json:"gas_cap,omitempty"`
-	// the proposer of the requested block
+	// proposer_address of the requested block in hex format
 	ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,3,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"`
-	// the eip155 chain id parsed from the requested block header
+	// chain_id is the eip155 chain id parsed from the requested block header
 	ChainId int64 `protobuf:"varint,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 }

@ -861,7 +861,7 @@ func (m *EthCallRequest) GetChainId() int64 {

 // EstimateGasResponse defines EstimateGas response
 type EstimateGasResponse struct {
-	// the estimated gas
+	// gas returns the estimated gas
 	Gas uint64 `protobuf:"varint,1,opt,name=gas,proto3" json:"gas,omitempty"`
 }

@ -907,22 +907,22 @@ func (m *EstimateGasResponse) GetGas() uint64 {

 // QueryTraceTxRequest defines TraceTx request
 type QueryTraceTxRequest struct {
-	// msgEthereumTx for the requested transaction
+	// msg is the MsgEthereumTx for the requested transaction
 	Msg *MsgEthereumTx `protobuf:"bytes,1,opt,name=msg,proto3" json:"msg,omitempty"`
-	// TraceConfig holds extra parameters to trace functions.
+	// trace_config holds extra parameters to trace functions.
 	TraceConfig *TraceConfig `protobuf:"bytes,3,opt,name=trace_config,json=traceConfig,proto3" json:"trace_config,omitempty"`
-	// the predecessor transactions included in the same block
+	// predecessors is an array of transactions included in the same block
 	// need to be replayed first to get correct context for tracing.
 	Predecessors []*MsgEthereumTx `protobuf:"bytes,4,rep,name=predecessors,proto3" json:"predecessors,omitempty"`
-	// block number of requested transaction
+	// block_number of requested transaction
 	BlockNumber int64 `protobuf:"varint,5,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
-	// block hex hash of requested transaction
+	// block_hash of requested transaction
 	BlockHash string `protobuf:"bytes,6,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"`
-	// block time of requested transaction
+	// block_time of requested transaction
 	BlockTime time.Time `protobuf:"bytes,7,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"`
-	// the proposer of the requested block
+	// proposer_address is the proposer of the requested block
 	ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"`
-	// the eip155 chain id parsed from the requested block header
+	// chain_id is the the eip155 chain id parsed from the requested block header
 	ChainId int64 `protobuf:"varint,9,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 }

@ -1017,7 +1017,7 @@ func (m *QueryTraceTxRequest) GetChainId() int64 {

 // QueryTraceTxResponse defines TraceTx response
 type QueryTraceTxResponse struct {
-	// response serialized in bytes
+	// data is the response serialized in bytes
 	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
 }

@ -1063,19 +1063,19 @@ func (m *QueryTraceTxResponse) GetData() []byte {

 // QueryTraceBlockRequest defines TraceTx request
 type QueryTraceBlockRequest struct {
-	// txs messages in the block
+	// txs is an array of messages in the block
 	Txs []*MsgEthereumTx `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"`
-	// TraceConfig holds extra parameters to trace functions.
+	// trace_config holds extra parameters to trace functions.
 	TraceConfig *TraceConfig `protobuf:"bytes,3,opt,name=trace_config,json=traceConfig,proto3" json:"trace_config,omitempty"`
-	// block number
+	// block_number of the traced block
 	BlockNumber int64 `protobuf:"varint,5,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
-	// block hex hash
+	// block_hash (hex) of the traced block
 	BlockHash string `protobuf:"bytes,6,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"`
-	// block time
+	// block_time of the traced block
 	BlockTime time.Time `protobuf:"bytes,7,opt,name=block_time,json=blockTime,proto3,stdtime" json:"block_time"`
-	// the proposer of the requested block
+	// proposer_address is the address of the requested block
 	ProposerAddress github_com_cosmos_cosmos_sdk_types.ConsAddress `protobuf:"bytes,8,opt,name=proposer_address,json=proposerAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ConsAddress" json:"proposer_address,omitempty"`
-	// the eip155 chain id parsed from the requested block header
+	// chain_id is the eip155 chain id parsed from the requested block header
 	ChainId int64 `protobuf:"varint,9,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
 }

@ -1163,6 +1163,7 @@ func (m *QueryTraceBlockRequest) GetChainId() int64 {

 // QueryTraceBlockResponse defines TraceBlock response
 type QueryTraceBlockResponse struct {
+	// data is the response serialized in bytes
 	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
 }

@ -1244,8 +1245,9 @@ func (m *QueryBaseFeeRequest) XXX_DiscardUnknown() {

 var xxx_messageInfo_QueryBaseFeeRequest proto.InternalMessageInfo

-// BaseFeeResponse returns the EIP1559 base fee.
+// QueryBaseFeeResponse returns the EIP1559 base fee.
 type QueryBaseFeeResponse struct {
+	// base_fee is the EIP1559 base fee
 	BaseFee *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=base_fee,json=baseFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"base_fee,omitempty"`
 }

@ -1321,20 +1323,20 @@ var fileDescriptor_e15a877459347994 = []byte{
 	0x3d, 0x50, 0x44, 0x7a, 0xe8, 0xad, 0xf7, 0x9e, 0xaa, 0x99, 0x9d, 0xf1, 0xd7, 0xfa, 0x23, 0x54,
 	0xf4, 0xd4, 0xd3, 0xee, 0xcc, 0xbc, 0x79, 0xef, 0xf7, 0x3e, 0xe6, 0xbd, 0x1f, 0x2c, 0x12, 0x56,
 	0x21, 0x7e, 0xbd, 0xea, 0x32, 0x8b, 0xb4, 0xea, 0x56, 0x6b, 0xdb, 0xba, 0xdb, 0x24, 0xfe, 0xbe,
-	0xd9, 0xf0, 0x3d, 0xe6, 0xa1, 0x64, 0xe7, 0xd4, 0x24, 0xad, 0xba, 0xd9, 0xda, 0xd6, 0x17, 0x1c,
-	0xcf, 0xf1, 0xc4, 0xa1, 0xc5, 0xff, 0x02, 0x39, 0x7d, 0xd3, 0xf6, 0x68, 0xdd, 0xa3, 0x56, 0x09,
-	0x53, 0x12, 0x28, 0xb0, 0x5a, 0xdb, 0x25, 0xc2, 0xf0, 0xb6, 0xd5, 0xc0, 0x4e, 0xd5, 0xc5, 0xac,
-	0xea, 0xb9, 0x52, 0x76, 0xd1, 0xf1, 0x3c, 0xa7, 0x46, 0x2c, 0xdc, 0xa8, 0x5a, 0xd8, 0x75, 0x3d,
-	0x26, 0x0e, 0xa9, 0x3c, 0xd5, 0x43, 0x78, 0xb8, 0xe1, 0xe0, 0xec, 0x54, 0xe8, 0x8c, 0xb5, 0xe5,
-	0x51, 0x46, 0x2a, 0x15, 0xab, 0x52, 0xf3, 0x8e, 0xc5, 0xaa, 0x75, 0x42, 0x19, 0xae, 0x37, 0x02,
-	0x01, 0xe3, 0x03, 0x38, 0xfe, 0x29, 0xc7, 0x75, 0xd9, 0xb6, 0xbd, 0xa6, 0xcb, 0x0a, 0xe4, 0x6e,
+	0xd9, 0xf0, 0x3d, 0xe6, 0xa1, 0x64, 0xe7, 0xd4, 0x24, 0xad, 0xba, 0xd9, 0xda, 0xd6, 0x37, 0x6d,
+	0x8f, 0xd6, 0x3d, 0x6a, 0x95, 0x30, 0x25, 0x81, 0xa8, 0xd5, 0xda, 0x2e, 0x11, 0x86, 0xb7, 0xad,
+	0x06, 0x76, 0xaa, 0x2e, 0x66, 0x55, 0xcf, 0x0d, 0x6e, 0xeb, 0x7a, 0x48, 0x37, 0x57, 0x12, 0x9c,
+	0x9d, 0x0a, 0x9d, 0xb1, 0xb6, 0x3c, 0x5a, 0x70, 0x3c, 0xc7, 0x13, 0xbf, 0x16, 0xff, 0x93, 0xbb,
+	0x8b, 0x8e, 0xe7, 0x39, 0x35, 0x62, 0xe1, 0x46, 0xd5, 0xc2, 0xae, 0xeb, 0x31, 0x61, 0x89, 0xca,
+	0xd3, 0x8c, 0x3c, 0x15, 0xab, 0x52, 0xf3, 0x8e, 0xc5, 0xaa, 0x75, 0x42, 0x19, 0xae, 0x37, 0x02,
+	0x01, 0xe3, 0x03, 0x38, 0xfe, 0x29, 0x47, 0x7b, 0xd9, 0xb6, 0xbd, 0xa6, 0xcb, 0x0a, 0xe4, 0x6e,
 	0x93, 0x50, 0x86, 0x52, 0x10, 0xc3, 0xe5, 0xb2, 0x4f, 0x28, 0x4d, 0x69, 0xcb, 0xda, 0xfa, 0x5c,
 	0x41, 0x2d, 0x2f, 0xc6, 0x1f, 0x3d, 0xcd, 0x4c, 0xfd, 0xf9, 0x34, 0x33, 0x65, 0xd8, 0xb0, 0xd0,
 	0x7f, 0x95, 0x36, 0x3c, 0x97, 0x12, 0x7e, 0xb7, 0x84, 0x6b, 0xd8, 0xb5, 0x89, 0xba, 0x2b, 0x97,
 	0xe8, 0x1d, 0x98, 0xb3, 0xbd, 0x32, 0x29, 0x56, 0x30, 0xad, 0xa4, 0xa6, 0xc5, 0x59, 0x9c, 0x6f,
 	0x7c, 0x84, 0x69, 0x05, 0x2d, 0xc0, 0x8c, 0xeb, 0xf1, 0x4b, 0x91, 0x65, 0x6d, 0x3d, 0x5a, 0x08,
-	0x16, 0xc6, 0x87, 0x70, 0x4a, 0x18, 0xc9, 0x8b, 0x40, 0xfe, 0x0b, 0x94, 0x0f, 0x35, 0xd0, 0x87,
-	0x69, 0x90, 0x60, 0x57, 0xe0, 0x68, 0x90, 0xa3, 0x62, 0xbf, 0xa6, 0x23, 0xc1, 0xee, 0xe5, 0x60,
+	0x16, 0xc6, 0x87, 0x70, 0x4a, 0x18, 0xc9, 0x8b, 0xf0, 0xfe, 0x0b, 0x94, 0x0f, 0x35, 0xd0, 0x87,
+	0x69, 0x90, 0x60, 0x57, 0xe0, 0x68, 0x90, 0xb9, 0x62, 0xbf, 0xa6, 0x23, 0xc1, 0xee, 0xe5, 0x60,
 	0x13, 0xe9, 0x10, 0xa7, 0xdc, 0x28, 0xc7, 0x37, 0x2d, 0xf0, 0x75, 0xd6, 0x5c, 0x05, 0x0e, 0xb4,
 	0x16, 0xdd, 0x66, 0xbd, 0x44, 0x7c, 0xe9, 0xc1, 0x11, 0xb9, 0xfb, 0x89, 0xd8, 0x34, 0xae, 0xc3,
 	0xa2, 0xc0, 0xf1, 0x39, 0xae, 0x55, 0xcb, 0x98, 0x79, 0xfe, 0x80, 0x33, 0xa7, 0x61, 0xde, 0xf6,
@ -1346,8 +1348,8 @@ var fileDescriptor_e15a877459347994 = []byte{
 	0x16, 0xc6, 0x05, 0x48, 0xca, 0x52, 0x2a, 0xbf, 0x96, 0x93, 0x6b, 0xf0, 0x56, 0xcf, 0x3d, 0x69,
 	0x02, 0x41, 0x94, 0xd7, 0xbe, 0xb8, 0x35, 0x5f, 0x10, 0xff, 0xc6, 0x3d, 0x40, 0x42, 0x70, 0xb7,
 	0x7d, 0xc3, 0x73, 0xa8, 0x32, 0x81, 0x20, 0x2a, 0x5e, 0x4c, 0xa0, 0x5f, 0xfc, 0xa3, 0x2b, 0x00,
-	0xdd, 0x0e, 0x22, 0x7c, 0x4b, 0x64, 0x57, 0xcd, 0xa0, 0x68, 0x4d, 0xde, 0x6e, 0xcc, 0xa0, 0x5f,
-	0xc9, 0x76, 0x63, 0xde, 0xea, 0x86, 0xaa, 0xd0, 0x73, 0xb3, 0x07, 0xe4, 0x77, 0x9a, 0x0c, 0xac,
+	0xdd, 0xbe, 0x22, 0x7c, 0x4b, 0x64, 0x57, 0xcd, 0xa0, 0x68, 0x4d, 0xde, 0x84, 0xcc, 0xa0, 0x5f,
+	0xc9, 0x26, 0x64, 0xde, 0xea, 0x86, 0xaa, 0xd0, 0x73, 0xb3, 0x07, 0xe4, 0x77, 0x9a, 0x0c, 0xac,
 	0x32, 0x2e, 0x71, 0x6e, 0x40, 0xb4, 0xe6, 0x39, 0xdc, 0xbb, 0xc8, 0x7a, 0x22, 0x7b, 0xc2, 0x1c,
 	0x6c, 0x7d, 0xe6, 0x0d, 0xcf, 0x29, 0x08, 0x11, 0x74, 0x75, 0x08, 0xa8, 0xb5, 0x89, 0xa0, 0x02,
 	0x3b, 0xbd, 0xa8, 0x8c, 0x05, 0x19, 0x87, 0x5b, 0xd8, 0xc7, 0x75, 0x15, 0x07, 0xe3, 0xa6, 0x04,
@ -1356,7 +1358,7 @@ var fileDescriptor_e15a877459347994 = []byte{
 	0x4a, 0x1e, 0xd7, 0x6a, 0x3d, 0x91, 0xc6, 0xbe, 0x43, 0x55, 0x4e, 0xf8, 0x3f, 0x3a, 0x09, 0x31,
 	0x07, 0xd3, 0xa2, 0x8d, 0x1b, 0xf2, 0x79, 0xcc, 0x3a, 0x98, 0xe6, 0x71, 0x03, 0xdd, 0x86, 0x64,
 	0xc3, 0xf7, 0x1a, 0x1e, 0x25, 0x7e, 0xe7, 0x89, 0xf1, 0xe7, 0x31, 0x9f, 0xcb, 0xfe, 0xfd, 0x22,
-	0x63, 0x3a, 0x55, 0x56, 0x69, 0x96, 0x4c, 0xdb, 0xab, 0x5b, 0x72, 0x0a, 0x04, 0x9f, 0xf3, 0xb4,
+	0x63, 0x3a, 0x55, 0x56, 0x69, 0x96, 0x4c, 0xdb, 0xab, 0x5b, 0x72, 0x36, 0x04, 0x9f, 0xf3, 0xb4,
 	0xbc, 0x67, 0xb1, 0xfd, 0x06, 0xa1, 0x66, 0xbe, 0xfb, 0xb6, 0x0b, 0xc7, 0x94, 0x2e, 0xf5, 0x2e,
 	0x4f, 0x41, 0xdc, 0xae, 0xe0, 0xaa, 0x5b, 0xac, 0x96, 0x53, 0xd1, 0x65, 0x6d, 0x3d, 0x52, 0x88,
 	0x89, 0xf5, 0xb5, 0xb2, 0xb1, 0x06, 0xc7, 0x77, 0x28, 0xab, 0xd6, 0x31, 0x23, 0x57, 0x71, 0x37,
@ -1379,7 +1381,7 @@ var fileDescriptor_e15a877459347994 = []byte{
 	0xab, 0x87, 0xf0, 0xe7, 0x9a, 0xcb, 0xf8, 0xc0, 0x15, 0xea, 0xb2, 0x7f, 0xcd, 0xc3, 0x8c, 0xd0,
 	0x8f, 0xbe, 0xd5, 0x20, 0x26, 0x79, 0x06, 0x5a, 0x09, 0xe7, 0x79, 0x08, 0x91, 0xd4, 0x57, 0x27,
 	0x89, 0x05, 0x58, 0x8d, 0x73, 0xdf, 0xfc, 0xf2, 0xc7, 0x0f, 0xd3, 0x2b, 0xe8, 0x8c, 0x15, 0x22,
-	0xb3, 0x92, 0x6b, 0x58, 0xf7, 0x65, 0x6e, 0x1e, 0xa0, 0x1f, 0x35, 0x38, 0xd2, 0x47, 0xe7, 0xd0,
+	0xc0, 0x92, 0x6b, 0x58, 0xf7, 0x65, 0x6e, 0x1e, 0xa0, 0x1f, 0x35, 0x38, 0xd2, 0x47, 0xe7, 0xd0,
 	0xb9, 0x11, 0x66, 0x86, 0xd1, 0x46, 0x7d, 0xeb, 0x70, 0xc2, 0x12, 0x59, 0x56, 0x20, 0xdb, 0x42,
 	0x9b, 0x61, 0x64, 0x8a, 0x39, 0x86, 0x00, 0xfe, 0xa4, 0x41, 0x72, 0x90, 0x99, 0x21, 0x73, 0x84,
 	0xd9, 0x11, 0x84, 0x50, 0xb7, 0x0e, 0x2d, 0x2f, 0x91, 0x5e, 0x14, 0x48, 0xdf, 0x47, 0xd9, 0x30,
@ -1402,7 +1404,7 @@ var fileDescriptor_e15a877459347994 = []byte{
 	0x3d, 0x7b, 0x95, 0xd6, 0x9e, 0xbf, 0x4a, 0x6b, 0x2f, 0x5f, 0xa5, 0xb5, 0x27, 0x07, 0xe9, 0xa9,
 	0xe7, 0x07, 0xe9, 0xa9, 0x5f, 0x0f, 0xd2, 0x53, 0x5f, 0xf4, 0x0e, 0x2f, 0xd2, 0xe2, 0xb3, 0xab,
 	0xab, 0xa5, 0x2d, 0xf4, 0x88, 0x01, 0x56, 0x9a, 0x15, 0xb3, 0xff, 0xbd, 0x7f, 0x02, 0x00, 0x00,
-	0xff, 0xff, 0x98, 0x6c, 0x20, 0x39, 0xc7, 0x11, 0x00, 0x00,
+	0xff, 0xff, 0xa4, 0xba, 0x06, 0x5b, 0xc7, 0x11, 0x00, 0x00,
 }

 // Reference imports to suppress errors if they are not otherwise used.
--- a/x/evm/types/tx.pb.go
+++ b/x/evm/types/tx.pb.go
@ -35,13 +35,13 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

 // MsgEthereumTx encapsulates an Ethereum transaction as an SDK message.
 type MsgEthereumTx struct {
-	// inner transaction data
+	// data is inner transaction data of the Ethereum transaction
 	Data *types.Any `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
-	// DEPRECATED: encoded storage size of the transaction
+	// size is the encoded storage size of the transaction (DEPRECATED)
 	Size_ float64 `protobuf:"fixed64,2,opt,name=size,proto3" json:"-"`
-	// transaction hash in hex format
+	// hash of the transaction in hex format
 	Hash string `protobuf:"bytes,3,opt,name=hash,proto3" json:"hash,omitempty" rlp:"-"`
-	// ethereum signer address in hex format. This address value is checked
+	// from is the ethereum signer address in hex format. This address value is checked
 	// against the address derived from the signature (V, R, S) using the
 	// secp256k1 elliptic curve
 	From string `protobuf:"bytes,4,opt,name=from,proto3" json:"from,omitempty"`
@ -86,15 +86,15 @@ var xxx_messageInfo_MsgEthereumTx proto.InternalMessageInfo
 type LegacyTx struct {
 	// nonce corresponds to the account nonce (transaction sequence).
 	Nonce uint64 `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"`
-	// gas price defines the value for each gas unit
+	// gas_price defines the value for each gas unit
 	GasPrice *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=gas_price,json=gasPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"gas_price,omitempty"`
 	// gas defines the gas limit defined for the transaction.
 	GasLimit uint64 `protobuf:"varint,3,opt,name=gas,proto3" json:"gas,omitempty"`
-	// hex formatted address of the recipient
+	// to is the hex formatted address of the recipient
 	To string `protobuf:"bytes,4,opt,name=to,proto3" json:"to,omitempty"`
 	// value defines the unsigned integer value of the transaction amount.
 	Amount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=value,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"value,omitempty"`
-	// input defines the data payload bytes of the transaction.
+	// data is the data payload bytes of the transaction.
 	Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
 	// v defines the signature value
 	V []byte `protobuf:"bytes,7,opt,name=v,proto3" json:"v,omitempty"`
@ -139,20 +139,21 @@ var xxx_messageInfo_LegacyTx proto.InternalMessageInfo

 // AccessListTx is the data of EIP-2930 access list transactions.
 type AccessListTx struct {
-	// destination EVM chain ID
+	// chain_id of the destination EVM chain
 	ChainID *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chainID"`
 	// nonce corresponds to the account nonce (transaction sequence).
 	Nonce uint64 `protobuf:"varint,2,opt,name=nonce,proto3" json:"nonce,omitempty"`
-	// gas price defines the value for each gas unit
+	// gas_price defines the value for each gas unit
 	GasPrice *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=gas_price,json=gasPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"gas_price,omitempty"`
 	// gas defines the gas limit defined for the transaction.
 	GasLimit uint64 `protobuf:"varint,4,opt,name=gas,proto3" json:"gas,omitempty"`
-	// hex formatted address of the recipient
+	// to is the recipient address in hex format
 	To string `protobuf:"bytes,5,opt,name=to,proto3" json:"to,omitempty"`
 	// value defines the unsigned integer value of the transaction amount.
 	Amount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=value,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"value,omitempty"`
-	// input defines the data payload bytes of the transaction.
+	// data is the data payload bytes of the transaction.
 	Data []byte `protobuf:"bytes,7,opt,name=data,proto3" json:"data,omitempty"`
+	// accesses is an array of access tuples
 	Accesses AccessList `protobuf:"bytes,8,rep,name=accesses,proto3,castrepeated=AccessList" json:"accessList"`
 	// v defines the signature value
 	V []byte `protobuf:"bytes,9,opt,name=v,proto3" json:"v,omitempty"`
@ -197,22 +198,23 @@ var xxx_messageInfo_AccessListTx proto.InternalMessageInfo

 // DynamicFeeTx is the data of EIP-1559 dinamic fee transactions.
 type DynamicFeeTx struct {
-	// destination EVM chain ID
+	// chain_id of the destination EVM chain
 	ChainID *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"chainID"`
 	// nonce corresponds to the account nonce (transaction sequence).
 	Nonce uint64 `protobuf:"varint,2,opt,name=nonce,proto3" json:"nonce,omitempty"`
-	// gas tip cap defines the max value for the gas tip
+	// gas_tip_cap defines the max value for the gas tip
 	GasTipCap *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=gas_tip_cap,json=gasTipCap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"gas_tip_cap,omitempty"`
-	// gas fee cap defines the max value for the gas fee
+	// gas_fee_cap defines the max value for the gas fee
 	GasFeeCap *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=gas_fee_cap,json=gasFeeCap,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"gas_fee_cap,omitempty"`
 	// gas defines the gas limit defined for the transaction.
 	GasLimit uint64 `protobuf:"varint,5,opt,name=gas,proto3" json:"gas,omitempty"`
-	// hex formatted address of the recipient
+	// to is the hex formatted address of the recipient
 	To string `protobuf:"bytes,6,opt,name=to,proto3" json:"to,omitempty"`
 	// value defines the the transaction amount.
 	Amount *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,7,opt,name=value,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"value,omitempty"`
-	// input defines the data payload bytes of the transaction.
+	// data is the data payload bytes of the transaction.
 	Data []byte `protobuf:"bytes,8,opt,name=data,proto3" json:"data,omitempty"`
+	// accesses is an array of access tuples
 	Accesses AccessList `protobuf:"bytes,9,rep,name=accesses,proto3,castrepeated=AccessList" json:"accessList"`
 	// v defines the signature value
 	V []byte `protobuf:"bytes,10,opt,name=v,proto3" json:"v,omitempty"`
@ -255,6 +257,7 @@ func (m *DynamicFeeTx) XXX_DiscardUnknown() {

 var xxx_messageInfo_DynamicFeeTx proto.InternalMessageInfo

+// ExtensionOptionsEthereumTx is an extension option for ethereum transactions
 type ExtensionOptionsEthereumTx struct {
 }

@ -293,19 +296,19 @@ var xxx_messageInfo_ExtensionOptionsEthereumTx proto.InternalMessageInfo

 // MsgEthereumTxResponse defines the Msg/EthereumTx response type.
 type MsgEthereumTxResponse struct {
-	// ethereum transaction hash in hex format. This hash differs from the
+	// hash of the ethereum transaction in hex format. This hash differs from the
 	// Tendermint sha256 hash of the transaction bytes. See
 	// https://github.com/tendermint/tendermint/issues/6539 for reference
 	Hash string `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	// logs contains the transaction hash and the proto-compatible ethereum
 	// logs.
 	Logs []*Log `protobuf:"bytes,2,rep,name=logs,proto3" json:"logs,omitempty"`
-	// returned data from evm function (result or data supplied with revert
+	// ret is the returned data from evm function (result or data supplied with revert
 	// opcode)
 	Ret []byte `protobuf:"bytes,3,opt,name=ret,proto3" json:"ret,omitempty"`
-	// vm error is the error returned by vm execution
+	// vm_error is the error returned by vm execution
 	VmError string `protobuf:"bytes,4,opt,name=vm_error,json=vmError,proto3" json:"vm_error,omitempty"`
-	// gas consumed by the transaction
+	// gas_used specifies how much gas was consumed by the transaction
 	GasUsed uint64 `protobuf:"varint,5,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"`
 }

@ -354,61 +357,61 @@ func init() {
 func init() { proto.RegisterFile("ethermint/evm/v1/tx.proto", fileDescriptor_f75ac0a12d075f21) }

 var fileDescriptor_f75ac0a12d075f21 = []byte{
-	// 852 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0x4f, 0x6f, 0xe3, 0x44,
-	0x14, 0xcf, 0x24, 0x4e, 0xec, 0x4c, 0xc2, 0x6a, 0x65, 0x75, 0x25, 0x27, 0x62, 0xe3, 0xc8, 0x12,
-	0x10, 0x90, 0x62, 0x6b, 0x0b, 0xa7, 0x9e, 0xb6, 0xd9, 0xfe, 0x51, 0xab, 0x54, 0x20, 0x2b, 0x5c,
-	0xe8, 0x21, 0x9a, 0x3a, 0x53, 0xc7, 0x22, 0xf6, 0x58, 0x9e, 0x89, 0xe5, 0x20, 0x71, 0x41, 0x1c,
-	0xb8, 0x81, 0xc4, 0x17, 0xe0, 0xc0, 0x89, 0x2b, 0x7c, 0x00, 0x8e, 0x15, 0xa7, 0x4a, 0x5c, 0x10,
-	0x07, 0x83, 0x52, 0x4e, 0xbd, 0xc1, 0x27, 0x40, 0x33, 0x76, 0x9a, 0x86, 0x28, 0x05, 0x4a, 0xd1,
-	0x9e, 0x32, 0xcf, 0xbf, 0x37, 0x6f, 0xde, 0x7b, 0xbf, 0x5f, 0xde, 0x83, 0x0d, 0xcc, 0xc6, 0x38,
-	0xf2, 0xbd, 0x80, 0x59, 0x38, 0xf6, 0xad, 0xf8, 0x99, 0xc5, 0x12, 0x33, 0x8c, 0x08, 0x23, 0xea,
-	0xe3, 0x1b, 0xc8, 0xc4, 0xb1, 0x6f, 0xc6, 0xcf, 0x9a, 0x5b, 0x2e, 0x71, 0x89, 0x00, 0x2d, 0x7e,
-	0xca, 0xfc, 0x9a, 0xaf, 0xba, 0x84, 0xb8, 0x13, 0x6c, 0xa1, 0xd0, 0xb3, 0x50, 0x10, 0x10, 0x86,
-	0x98, 0x47, 0x02, 0x9a, 0xa3, 0x8d, 0x1c, 0x15, 0xd6, 0xd9, 0xf4, 0xdc, 0x42, 0xc1, 0x6c, 0x01,
-	0x39, 0x84, 0xfa, 0x84, 0x0e, 0xb3, 0x88, 0x99, 0x91, 0x43, 0xcd, 0xb5, 0xb4, 0x78, 0x0a, 0x02,
-	0x33, 0x3e, 0x07, 0xf0, 0x95, 0x13, 0xea, 0xee, 0x73, 0x0f, 0x3c, 0xf5, 0x07, 0x89, 0xda, 0x81,
-	0xd2, 0x08, 0x31, 0xa4, 0x81, 0x36, 0xe8, 0xd4, 0xb6, 0xb7, 0xcc, 0xec, 0x49, 0x73, 0xf1, 0xa4,
-	0xb9, 0x1b, 0xcc, 0x6c, 0xe1, 0xa1, 0x36, 0xa0, 0x44, 0xbd, 0x8f, 0xb0, 0x56, 0x6c, 0x83, 0x0e,
-	0xe8, 0x95, 0xaf, 0x53, 0x1d, 0x74, 0x6d, 0xf1, 0x49, 0xd5, 0xa1, 0x34, 0x46, 0x74, 0xac, 0x95,
-	0xda, 0xa0, 0x53, 0xed, 0xd5, 0xfe, 0x48, 0x75, 0x39, 0x9a, 0x84, 0x3b, 0x46, 0xd7, 0xb0, 0x05,
-	0xa0, 0xaa, 0x50, 0x3a, 0x8f, 0x88, 0xaf, 0x49, 0xdc, 0xc1, 0x16, 0xe7, 0x1d, 0xe9, 0xb3, 0xaf,
-	0xf4, 0x82, 0xf1, 0x6d, 0x11, 0x2a, 0x7d, 0xec, 0x22, 0x67, 0x36, 0x48, 0xd4, 0x2d, 0x58, 0x0e,
-	0x48, 0xe0, 0x60, 0x91, 0x8d, 0x64, 0x67, 0x86, 0x7a, 0x08, 0xab, 0x2e, 0xe2, 0xa5, 0x7a, 0x4e,
-	0xf6, 0x7a, 0xb5, 0xf7, 0xd6, 0xcf, 0xa9, 0xfe, 0xba, 0xeb, 0xb1, 0xf1, 0xf4, 0xcc, 0x74, 0x88,
-	0x9f, 0x37, 0x20, 0xff, 0xe9, 0xd2, 0xd1, 0x87, 0x16, 0x9b, 0x85, 0x98, 0x9a, 0x47, 0x01, 0xb3,
-	0x15, 0x17, 0xd1, 0xf7, 0xf8, 0x5d, 0xb5, 0x05, 0x4b, 0x2e, 0xa2, 0x22, 0x4b, 0xa9, 0x57, 0x9f,
-	0xa7, 0xba, 0x72, 0x88, 0x68, 0xdf, 0xf3, 0x3d, 0x66, 0x73, 0x40, 0x7d, 0x04, 0x8b, 0x8c, 0xe4,
-	0x39, 0x16, 0x19, 0x51, 0x8f, 0x61, 0x39, 0x46, 0x93, 0x29, 0xd6, 0xca, 0xe2, 0xd1, 0x77, 0xfe,
-	0xf9, 0xa3, 0xf3, 0x54, 0xaf, 0xec, 0xfa, 0x64, 0x1a, 0x30, 0x3b, 0x0b, 0xc1, 0x3b, 0x20, 0xfa,
-	0x5c, 0x69, 0x83, 0x4e, 0x3d, 0xef, 0x68, 0x1d, 0x82, 0x58, 0x93, 0xc5, 0x07, 0x10, 0x73, 0x2b,
-	0xd2, 0x94, 0xcc, 0x8a, 0xb8, 0x45, 0xb5, 0x6a, 0x66, 0xd1, 0x9d, 0x47, 0xbc, 0x57, 0x3f, 0x7c,
-	0xd7, 0xad, 0x0c, 0x92, 0x3d, 0xc4, 0x90, 0xf1, 0x7b, 0x09, 0xd6, 0x77, 0x1d, 0x07, 0x53, 0xda,
-	0xf7, 0x28, 0x1b, 0x24, 0xea, 0x29, 0x54, 0x9c, 0x31, 0xf2, 0x82, 0xa1, 0x37, 0x12, 0xcd, 0xab,
-	0xf6, 0x9e, 0xff, 0xab, 0x6c, 0xe5, 0x17, 0xfc, 0xf6, 0xd1, 0xde, 0x75, 0xaa, 0xcb, 0x4e, 0x76,
-	0xb4, 0xf3, 0xc3, 0x68, 0x49, 0x4b, 0x71, 0x23, 0x2d, 0xa5, 0xff, 0x4e, 0x8b, 0x74, 0x37, 0x2d,
-	0xe5, 0x75, 0x5a, 0x2a, 0x0f, 0x47, 0x8b, 0x7c, 0x8b, 0x96, 0x53, 0xa8, 0x20, 0xd1, 0x5b, 0x4c,
-	0x35, 0xa5, 0x5d, 0xea, 0xd4, 0xb6, 0x9f, 0x9a, 0x7f, 0xfd, 0x3f, 0x9b, 0x59, 0xf7, 0x07, 0xd3,
-	0x70, 0x82, 0x7b, 0xed, 0x8b, 0x54, 0x2f, 0x5c, 0xa7, 0x3a, 0x44, 0x37, 0x94, 0x7c, 0xf3, 0x8b,
-	0x0e, 0x97, 0x04, 0xd9, 0x37, 0x01, 0x33, 0xce, 0xab, 0x2b, 0x9c, 0xc3, 0x15, 0xce, 0x6b, 0x9b,
-	0x38, 0xff, 0x5e, 0x82, 0xf5, 0xbd, 0x59, 0x80, 0x7c, 0xcf, 0x39, 0xc0, 0xf8, 0xe5, 0x70, 0x7e,
-	0x0c, 0x6b, 0x9c, 0x73, 0xe6, 0x85, 0x43, 0x07, 0x85, 0xf7, 0x60, 0x9d, 0x4b, 0x66, 0xe0, 0x85,
-	0x2f, 0x50, 0xb8, 0x88, 0x75, 0x8e, 0xb1, 0x88, 0x25, 0xdd, 0x2b, 0xd6, 0x01, 0xc6, 0x3c, 0x56,
-	0x2e, 0xa1, 0xf2, 0xdd, 0x12, 0xaa, 0xac, 0x4b, 0x48, 0x7e, 0x38, 0x09, 0x29, 0x1b, 0x24, 0x54,
-	0xfd, 0x5f, 0x24, 0x04, 0x57, 0x24, 0x54, 0x5b, 0x91, 0x50, 0x7d, 0x93, 0x84, 0x0c, 0xd8, 0xdc,
-	0x4f, 0x18, 0x0e, 0xa8, 0x47, 0x82, 0x77, 0x43, 0xb1, 0x6a, 0x96, 0xab, 0x20, 0x1f, 0xc8, 0x5f,
-	0x03, 0xf8, 0x64, 0x65, 0x45, 0xd8, 0x98, 0x86, 0x24, 0xa0, 0xa2, 0x50, 0x31, 0xe5, 0x41, 0x36,
-	0xc4, 0xc5, 0x60, 0x7f, 0x13, 0x4a, 0x13, 0xe2, 0x52, 0xad, 0x28, 0x8a, 0x7c, 0xb2, 0x5e, 0x64,
-	0x9f, 0xb8, 0xb6, 0x70, 0x51, 0x1f, 0xc3, 0x52, 0x84, 0x99, 0xd0, 0x4c, 0xdd, 0xe6, 0x47, 0xb5,
-	0x01, 0x95, 0xd8, 0x1f, 0xe2, 0x28, 0x22, 0x51, 0x3e, 0x75, 0xe5, 0xd8, 0xdf, 0xe7, 0x26, 0x87,
-	0xb8, 0x38, 0xa6, 0x14, 0x8f, 0x32, 0x56, 0x6d, 0xd9, 0x45, 0xf4, 0x7d, 0x8a, 0x47, 0x59, 0x9a,
-	0xdb, 0x9f, 0x02, 0x58, 0x3a, 0xa1, 0xae, 0xfa, 0x31, 0x84, 0xb7, 0xb6, 0x99, 0xbe, 0x9e, 0xc0,
-	0x4a, 0x2d, 0xcd, 0x37, 0xfe, 0xc6, 0x61, 0x51, 0xac, 0xf1, 0xda, 0x27, 0x3f, 0xfe, 0xf6, 0x65,
-	0x51, 0x37, 0x9e, 0x5a, 0xeb, 0xeb, 0x34, 0xf7, 0x1e, 0xb2, 0xa4, 0xf7, 0xfc, 0x62, 0xde, 0x02,
-	0x97, 0xf3, 0x16, 0xf8, 0x75, 0xde, 0x02, 0x5f, 0x5c, 0xb5, 0x0a, 0x97, 0x57, 0xad, 0xc2, 0x4f,
-	0x57, 0xad, 0xc2, 0x07, 0xb7, 0xf5, 0x84, 0x63, 0x2e, 0xa7, 0x65, 0xa0, 0x44, 0x84, 0x12, 0x9a,
-	0x3a, 0xab, 0x88, 0x55, 0xfb, 0xf6, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x40, 0x52, 0x65, 0x8f,
-	0x4e, 0x08, 0x00, 0x00,
+	// 853 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0x31, 0x8f, 0xe3, 0x44,
+	0x14, 0xce, 0x24, 0x4e, 0xec, 0x4c, 0xc2, 0xe9, 0x64, 0xed, 0x49, 0x4e, 0xc4, 0xc5, 0x91, 0x25,
+	0x20, 0x20, 0xc5, 0xd6, 0x2d, 0x54, 0x5b, 0xdd, 0xe6, 0x76, 0xef, 0x74, 0xa7, 0x9c, 0x40, 0x56,
+	0x68, 0xb8, 0x22, 0x9a, 0x75, 0x66, 0x1d, 0x8b, 0xd8, 0x63, 0x79, 0x26, 0x96, 0x83, 0x44, 0x83,
+	0x28, 0xe8, 0x40, 0xe2, 0x0f, 0x50, 0x50, 0xd1, 0xc2, 0x0f, 0xa0, 0x3c, 0x51, 0x9d, 0x44, 0x83,
+	0x28, 0x0c, 0xca, 0x52, 0x6d, 0x07, 0xbf, 0x00, 0xcd, 0x8c, 0xb3, 0xd9, 0x10, 0x65, 0x81, 0x65,
+	0xd1, 0x55, 0x99, 0xe7, 0xf7, 0xde, 0x37, 0x6f, 0xde, 0xf7, 0xe5, 0x3d, 0xd8, 0xc2, 0x6c, 0x8a,
+	0x93, 0x30, 0x88, 0x98, 0x83, 0xd3, 0xd0, 0x49, 0xef, 0x39, 0x2c, 0xb3, 0xe3, 0x84, 0x30, 0xa2,
+	0xdf, 0xbe, 0x70, 0xd9, 0x38, 0x0d, 0xed, 0xf4, 0x5e, 0xbb, 0xe5, 0x11, 0x1a, 0x12, 0x3a, 0x16,
+	0x7e, 0x47, 0x1a, 0x32, 0xb8, 0xdd, 0xde, 0xc2, 0xe1, 0x39, 0xd2, 0xb7, 0xe7, 0x13, 0x9f, 0xc8,
+	0x1c, 0x7e, 0x2a, 0xbe, 0xbe, 0xea, 0x13, 0xe2, 0xcf, 0xb0, 0x83, 0xe2, 0xc0, 0x41, 0x51, 0x44,
+	0x18, 0x62, 0x01, 0x89, 0x56, 0x78, 0xad, 0xc2, 0x2b, 0xac, 0x93, 0xf9, 0xa9, 0x83, 0xa2, 0x85,
+	0x74, 0x59, 0x9f, 0x03, 0xf8, 0xca, 0x53, 0xea, 0x1f, 0xf3, 0x0b, 0xf1, 0x3c, 0x1c, 0x65, 0x7a,
+	0x0f, 0x2a, 0x13, 0xc4, 0x90, 0x01, 0xba, 0xa0, 0xd7, 0xd8, 0xdf, 0xb3, 0x65, 0xae, 0xbd, 0xca,
+	0xb5, 0x0f, 0xa3, 0x85, 0x2b, 0x22, 0xf4, 0x16, 0x54, 0x68, 0xf0, 0x11, 0x36, 0xca, 0x5d, 0xd0,
+	0x03, 0x83, 0xea, 0x79, 0x6e, 0x82, 0xbe, 0x2b, 0x3e, 0xe9, 0x26, 0x54, 0xa6, 0x88, 0x4e, 0x8d,
+	0x4a, 0x17, 0xf4, 0xea, 0x83, 0xc6, 0x1f, 0xb9, 0xa9, 0x26, 0xb3, 0xf8, 0xc0, 0xea, 0x5b, 0xae,
+	0x70, 0xe8, 0x3a, 0x54, 0x4e, 0x13, 0x12, 0x1a, 0x0a, 0x0f, 0x70, 0xc5, 0xf9, 0x40, 0xf9, 0xec,
+	0x2b, 0xb3, 0x64, 0x7d, 0x5b, 0x86, 0xda, 0x10, 0xfb, 0xc8, 0x5b, 0x8c, 0x32, 0x7d, 0x0f, 0x56,
+	0x23, 0x12, 0x79, 0x58, 0x54, 0xa3, 0xb8, 0xd2, 0xd0, 0x1f, 0xc1, 0xba, 0x8f, 0x78, 0xe7, 0x02,
+	0x4f, 0xde, 0x5e, 0x1f, 0xbc, 0xf5, 0x73, 0x6e, 0xbe, 0xee, 0x07, 0x6c, 0x3a, 0x3f, 0xb1, 0x3d,
+	0x12, 0x16, 0xfd, 0x2c, 0x7e, 0xfa, 0x74, 0xf2, 0xa1, 0xc3, 0x16, 0x31, 0xa6, 0xf6, 0xe3, 0x88,
+	0xb9, 0x9a, 0x8f, 0xe8, 0x7b, 0x3c, 0x57, 0xef, 0xc0, 0x8a, 0x8f, 0xa8, 0xa8, 0x52, 0x19, 0x34,
+	0x97, 0xb9, 0xa9, 0x3d, 0x42, 0x74, 0x18, 0x84, 0x01, 0x73, 0xb9, 0x43, 0xbf, 0x05, 0xcb, 0x8c,
+	0x14, 0x35, 0x96, 0x19, 0xd1, 0x9f, 0xc0, 0x6a, 0x8a, 0x66, 0x73, 0x6c, 0x54, 0xc5, 0xa5, 0xef,
+	0xfc, 0xf3, 0x4b, 0x97, 0xb9, 0x59, 0x3b, 0x0c, 0xc9, 0x3c, 0x62, 0xae, 0x84, 0xe0, 0x1d, 0x10,
+	0x7d, 0xae, 0x75, 0x41, 0xaf, 0x59, 0x74, 0xb4, 0x09, 0x41, 0x6a, 0xa8, 0xe2, 0x03, 0x48, 0xb9,
+	0x95, 0x18, 0x9a, 0xb4, 0x12, 0x6e, 0x51, 0xa3, 0x2e, 0x2d, 0x7a, 0x70, 0x8b, 0xf7, 0xea, 0x87,
+	0xef, 0xfa, 0xb5, 0x51, 0x76, 0x84, 0x18, 0xb2, 0x7e, 0xaf, 0xc0, 0xe6, 0xa1, 0xe7, 0x61, 0x4a,
+	0x87, 0x01, 0x65, 0xa3, 0x4c, 0x7f, 0x06, 0x35, 0x6f, 0x8a, 0x82, 0x68, 0x1c, 0x4c, 0x44, 0xf3,
+	0xea, 0x83, 0xfb, 0xff, 0xaa, 0x5a, 0xf5, 0x01, 0xcf, 0x7e, 0x7c, 0x74, 0x9e, 0x9b, 0xaa, 0x27,
+	0x8f, 0x6e, 0x71, 0x98, 0xac, 0x69, 0x29, 0xef, 0xa4, 0xa5, 0xf2, 0xdf, 0x69, 0x51, 0xae, 0xa6,
+	0xa5, 0xba, 0x4d, 0x4b, 0xed, 0xe6, 0x68, 0x51, 0x2f, 0xd1, 0xf2, 0x0c, 0x6a, 0x48, 0xf4, 0x16,
+	0x53, 0x43, 0xeb, 0x56, 0x7a, 0x8d, 0xfd, 0xbb, 0xf6, 0x5f, 0xff, 0xcf, 0xb6, 0xec, 0xfe, 0x68,
+	0x1e, 0xcf, 0xf0, 0xa0, 0xfb, 0x3c, 0x37, 0x4b, 0xe7, 0xb9, 0x09, 0xd1, 0x05, 0x25, 0xdf, 0xfc,
+	0x62, 0xc2, 0x35, 0x41, 0xee, 0x05, 0xa0, 0xe4, 0xbc, 0xbe, 0xc1, 0x39, 0xdc, 0xe0, 0xbc, 0xb1,
+	0x8b, 0xf3, 0xef, 0x15, 0xd8, 0x3c, 0x5a, 0x44, 0x28, 0x0c, 0xbc, 0x87, 0x18, 0xbf, 0x1c, 0xce,
+	0x9f, 0xc0, 0x06, 0xe7, 0x9c, 0x05, 0xf1, 0xd8, 0x43, 0xf1, 0x35, 0x58, 0xe7, 0x92, 0x19, 0x05,
+	0xf1, 0x03, 0x14, 0xaf, 0xb0, 0x4e, 0x31, 0x16, 0x58, 0xca, 0xb5, 0xb0, 0x1e, 0x62, 0xcc, 0xb1,
+	0x0a, 0x09, 0x55, 0xaf, 0x96, 0x50, 0x6d, 0x5b, 0x42, 0xea, 0xcd, 0x49, 0x48, 0xdb, 0x21, 0xa1,
+	0xfa, 0xff, 0x22, 0x21, 0xb8, 0x21, 0xa1, 0xc6, 0x86, 0x84, 0x9a, 0xbb, 0x24, 0x64, 0xc1, 0xf6,
+	0x71, 0xc6, 0x70, 0x44, 0x03, 0x12, 0xbd, 0x1b, 0x8b, 0x9d, 0xb1, 0x5e, 0x05, 0xc5, 0x40, 0xfe,
+	0x1a, 0xc0, 0x3b, 0x1b, 0x2b, 0xc2, 0xc5, 0x34, 0x26, 0x11, 0x15, 0x0f, 0x15, 0x53, 0x1e, 0xc8,
+	0x21, 0x2e, 0x06, 0xfb, 0x9b, 0x50, 0x99, 0x11, 0x9f, 0x1a, 0x65, 0xf1, 0xc8, 0x3b, 0xdb, 0x8f,
+	0x1c, 0x12, 0xdf, 0x15, 0x21, 0xfa, 0x6d, 0x58, 0x49, 0x30, 0x13, 0x9a, 0x69, 0xba, 0xfc, 0xa8,
+	0xb7, 0xa0, 0x96, 0x86, 0x63, 0x9c, 0x24, 0x24, 0x29, 0xa6, 0xae, 0x9a, 0x86, 0xc7, 0xdc, 0xe4,
+	0x2e, 0x2e, 0x8e, 0x39, 0xc5, 0x13, 0xc9, 0xaa, 0xab, 0xfa, 0x88, 0xbe, 0x4f, 0xf1, 0x44, 0x96,
+	0xb9, 0xff, 0x29, 0x80, 0x95, 0xa7, 0xd4, 0xd7, 0x3f, 0x86, 0xf0, 0xd2, 0x36, 0x33, 0xb7, 0x0b,
+	0xd8, 0x78, 0x4b, 0xfb, 0x8d, 0xbf, 0x09, 0x58, 0x3d, 0xd6, 0x7a, 0xed, 0x93, 0x1f, 0x7f, 0xfb,
+	0xb2, 0x6c, 0x5a, 0x77, 0x9d, 0xed, 0xed, 0x5c, 0x44, 0x8f, 0x59, 0x36, 0xb8, 0xff, 0x7c, 0xd9,
+	0x01, 0x2f, 0x96, 0x1d, 0xf0, 0xeb, 0xb2, 0x03, 0xbe, 0x38, 0xeb, 0x94, 0x5e, 0x9c, 0x75, 0x4a,
+	0x3f, 0x9d, 0x75, 0x4a, 0x1f, 0x5c, 0xd6, 0x13, 0x4e, 0xb9, 0x9c, 0xd6, 0x40, 0x99, 0x80, 0x12,
+	0x9a, 0x3a, 0xa9, 0x89, 0x55, 0xfb, 0xf6, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xce, 0x14,
+	0xcb, 0x4e, 0x08, 0x00, 0x00,
 }

 // Reference imports to suppress errors if they are not otherwise used.
--- a/x/feemarket/types/feemarket.pb.go
+++ b/x/feemarket/types/feemarket.pb.go
@ -26,22 +26,22 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

 // Params defines the EVM module parameters
 type Params struct {
-	// no base fee forces the EIP-1559 base fee to 0 (needed for 0 price calls)
+	// no_base_fee forces the EIP-1559 base fee to 0 (needed for 0 price calls)
 	NoBaseFee bool `protobuf:"varint,1,opt,name=no_base_fee,json=noBaseFee,proto3" json:"no_base_fee,omitempty"`
-	// base fee change denominator bounds the amount the base fee can change
+	// base_fee_change_denominator bounds the amount the base fee can change
 	// between blocks.
 	BaseFeeChangeDenominator uint32 `protobuf:"varint,2,opt,name=base_fee_change_denominator,json=baseFeeChangeDenominator,proto3" json:"base_fee_change_denominator,omitempty"`
-	// elasticity multiplier bounds the maximum gas limit an EIP-1559 block may
+	// elasticity_multiplier bounds the maximum gas limit an EIP-1559 block may
 	// have.
 	ElasticityMultiplier uint32 `protobuf:"varint,3,opt,name=elasticity_multiplier,json=elasticityMultiplier,proto3" json:"elasticity_multiplier,omitempty"`
-	// height at which the base fee calculation is enabled.
+	// enable_height defines at which block height the base fee calculation is enabled.
 	EnableHeight int64 `protobuf:"varint,5,opt,name=enable_height,json=enableHeight,proto3" json:"enable_height,omitempty"`
-	// base fee for EIP-1559 blocks.
+	// base_fee for EIP-1559 blocks.
 	BaseFee github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,6,opt,name=base_fee,json=baseFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"base_fee"`
 	// min_gas_price defines the minimum gas price value for cosmos and eth transactions
 	MinGasPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=min_gas_price,json=minGasPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_gas_price"`
-	// min gas denominator bounds the minimum gasUsed to be charged
-	// to senders based on GasLimit
+	// min_gas_multiplier bounds the minimum gas used to be charged
+	// to senders based on gas limit
 	MinGasMultiplier github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=min_gas_multiplier,json=minGasMultiplier,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_gas_multiplier"`
 }

--- a/x/feemarket/types/genesis.pb.go
+++ b/x/feemarket/types/genesis.pb.go
@ -25,9 +25,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package

 // GenesisState defines the feemarket module's genesis state.
 type GenesisState struct {
-	// params defines all the paramaters of the module.
+	// params defines all the parameters of the feemarket module.
 	Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"`
-	// block gas is the amount of gas wanted on the last block before the upgrade.
+	// block_gas is the amount of gas wanted on the last block before the upgrade.
 	// Zero by default.
 	BlockGas uint64 `protobuf:"varint,3,opt,name=block_gas,json=blockGas,proto3" json:"block_gas,omitempty"`
 }
@ -92,18 +92,18 @@ var fileDescriptor_6241c21661288629 = []byte{
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0x2d, 0xc9, 0x48,
 	0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x4b, 0x4d, 0xcd, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1,
 	0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
-	0x17, 0x12, 0x83, 0xab, 0xd2, 0x83, 0xab, 0xd2, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf,
-	0x07, 0x2b, 0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0xd4, 0x70, 0x98, 0x89, 0xd0, 0x0a, 0x56, 0xa7,
-	0x54, 0xc9, 0xc5, 0xe3, 0x0e, 0xb1, 0x26, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x86, 0x8b, 0xad,
-	0x20, 0xb1, 0x28, 0x31, 0xb7, 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x4e, 0x0f, 0xbb,
-	0xb5, 0x7a, 0x01, 0x60, 0x55, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0xf5, 0x08, 0x49,
-	0x73, 0x71, 0x26, 0xe5, 0xe4, 0x27, 0x67, 0xc7, 0xa7, 0x27, 0x16, 0x4b, 0x30, 0x2b, 0x30, 0x6a,
-	0xb0, 0x04, 0x71, 0x80, 0x05, 0xdc, 0x13, 0x8b, 0xbd, 0x58, 0x38, 0x98, 0x04, 0x98, 0x83, 0x38,
-	0x92, 0x12, 0x8b, 0x53, 0xe3, 0xd3, 0x52, 0x53, 0x9d, 0xdc, 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, 0x4a, 0x27, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57,
-	0x3f, 0xb5, 0x2c, 0x37, 0xbf, 0x58, 0x1f, 0xe1, 0x9b, 0x0a, 0x24, 0xff, 0x94, 0x54, 0x16, 0xa4,
-	0x16, 0x27, 0xb1, 0x81, 0x7d, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xda, 0x93, 0xcb,
+	0x17, 0x12, 0x83, 0xab, 0xd2, 0x83, 0xab, 0xd2, 0x2b, 0x33, 0x94, 0x52, 0xc3, 0xa1, 0x1b, 0xa1,
+	0x08, 0xac, 0x5f, 0x4a, 0x24, 0x3d, 0x3f, 0x3d, 0x1f, 0xcc, 0xd4, 0x07, 0xb1, 0x20, 0xa2, 0x4a,
+	0x95, 0x5c, 0x3c, 0xee, 0x10, 0x6b, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0x6c, 0xb8, 0xd8, 0x0a,
+	0x12, 0x8b, 0x12, 0x73, 0x8b, 0x25, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0xe4, 0xf4, 0xb0, 0x5b,
+	0xab, 0x17, 0x00, 0x56, 0xe5, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x54, 0x8f, 0x90, 0x34,
+	0x17, 0x67, 0x52, 0x4e, 0x7e, 0x72, 0x76, 0x7c, 0x7a, 0x62, 0xb1, 0x04, 0xb3, 0x02, 0xa3, 0x06,
+	0x4b, 0x10, 0x07, 0x58, 0xc0, 0x3d, 0xb1, 0xd8, 0x8b, 0x85, 0x83, 0x49, 0x80, 0x39, 0x88, 0x23,
+	0x29, 0xb1, 0x38, 0x35, 0x3e, 0x2d, 0x35, 0xd5, 0xc9, 0xed, 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, 0x74, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5,
+	0x53, 0xcb, 0x72, 0xf3, 0x8b, 0xf5, 0x11, 0x7e, 0xac, 0x40, 0xf2, 0x65, 0x49, 0x65, 0x41, 0x6a,
+	0x71, 0x12, 0x1b, 0xd8, 0x27, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x3a, 0x44, 0x94,
 	0x47, 0x01, 0x00, 0x00,
 }

--- a/x/feemarket/types/query.pb.go
+++ b/x/feemarket/types/query.pb.go
@ -151,8 +151,9 @@ func (m *QueryBaseFeeRequest) XXX_DiscardUnknown() {

 var xxx_messageInfo_QueryBaseFeeRequest proto.InternalMessageInfo

-// BaseFeeResponse returns the EIP1559 base fee.
+// QueryBaseFeeResponse returns the EIP1559 base fee.
 type QueryBaseFeeResponse struct {
+	// base_fee is the EIP1559 base fee
 	BaseFee *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=base_fee,json=baseFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"base_fee,omitempty"`
 }

@ -229,6 +230,7 @@ var xxx_messageInfo_QueryBlockGasRequest proto.InternalMessageInfo

 // QueryBlockGasResponse returns block gas used for a given height.
 type QueryBlockGasResponse struct {
+	// gas is the returned block gas
 	Gas int64 `protobuf:"varint,1,opt,name=gas,proto3" json:"gas,omitempty"`
 }

@ -290,31 +292,31 @@ var fileDescriptor_71a07c1ffd85fde2 = []byte{
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
 	0x10, 0xf5, 0x12, 0x48, 0xcb, 0x72, 0x41, 0x4b, 0x5a, 0x21, 0x0b, 0x6d, 0x83, 0x91, 0xa2, 0xb6,
 	0xb4, 0x5e, 0xb5, 0x5c, 0x39, 0x59, 0xa2, 0x88, 0x1b, 0x98, 0x1b, 0x12, 0xaa, 0xd6, 0x61, 0xea,
-	0x58, 0x89, 0xbd, 0x8e, 0x77, 0x13, 0x91, 0x2b, 0x37, 0x2e, 0x08, 0xc1, 0xd7, 0xf0, 0x07, 0x39,
-	0x46, 0xe2, 0x82, 0x38, 0x44, 0x28, 0xe1, 0x43, 0x90, 0xd7, 0xeb, 0x24, 0x06, 0x0c, 0x39, 0x65,
-	0x35, 0x79, 0xf3, 0xde, 0x9b, 0x37, 0x63, 0xec, 0x80, 0xea, 0x41, 0x16, 0x47, 0x89, 0x62, 0x57,
-	0x00, 0x31, 0xcf, 0xfa, 0xa0, 0xd8, 0xf8, 0x8c, 0x0d, 0x47, 0x90, 0x4d, 0xdc, 0x34, 0x13, 0x4a,
-	0x90, 0xfd, 0x15, 0xc6, 0x5d, 0x61, 0xdc, 0xf1, 0x99, 0xdd, 0x0a, 0x45, 0x28, 0x34, 0x84, 0xe5,
-	0xaf, 0x02, 0x6d, 0xdf, 0x0b, 0x85, 0x08, 0x07, 0xc0, 0x78, 0x1a, 0x31, 0x9e, 0x24, 0x42, 0x71,
-	0x15, 0x89, 0x44, 0x9a, 0x7f, 0x3b, 0x35, 0x7a, 0x6b, 0x62, 0x8d, 0x73, 0x5a, 0x98, 0xbc, 0xc8,
-	0x2d, 0x3c, 0xe7, 0x19, 0x8f, 0xa5, 0x0f, 0xc3, 0x11, 0x48, 0xe5, 0xbc, 0xc4, 0x77, 0x2a, 0x55,
-	0x99, 0x8a, 0x44, 0x02, 0x79, 0x8c, 0x9b, 0xa9, 0xae, 0xdc, 0x45, 0x6d, 0x74, 0x78, 0xeb, 0x9c,
-	0xba, 0x7f, 0x77, 0xec, 0x16, 0x7d, 0xde, 0xf5, 0xe9, 0xfc, 0xc0, 0xf2, 0x4d, 0x8f, 0xb3, 0x67,
-	0x48, 0x3d, 0x2e, 0xe1, 0x02, 0xa0, 0xd4, 0x7a, 0x8d, 0x5b, 0xd5, 0xb2, 0x11, 0x7b, 0x82, 0x77,
-	0x03, 0x2e, 0xe1, 0xf2, 0x0a, 0x40, 0xcb, 0xdd, 0xf4, 0x8e, 0xbf, 0xcf, 0x0f, 0x3a, 0x61, 0xa4,
-	0x7a, 0xa3, 0xc0, 0xed, 0x8a, 0x98, 0x75, 0x85, 0x8c, 0x85, 0x34, 0x3f, 0xa7, 0xf2, 0x4d, 0x9f,
-	0xa9, 0x49, 0x0a, 0xd2, 0x7d, 0x96, 0x28, 0x7f, 0x27, 0x28, 0xe8, 0x9c, 0xfd, 0x92, 0x7e, 0x20,
-	0xba, 0xfd, 0xa7, 0x7c, 0x35, 0xe2, 0x11, 0xde, 0xfb, 0xad, 0x6e, 0x74, 0x6f, 0xe3, 0x46, 0xc8,
-	0x8b, 0x09, 0x1b, 0x7e, 0xfe, 0x3c, 0xff, 0xd2, 0xc0, 0x37, 0x34, 0x96, 0xbc, 0x47, 0xb8, 0x59,
-	0xcc, 0x46, 0x8e, 0xeb, 0x66, 0xff, 0x33, 0x4e, 0xfb, 0xe1, 0x56, 0xd8, 0x42, 0xdf, 0xe9, 0xbc,
-	0xfb, 0xfa, 0xf3, 0xf3, 0xb5, 0x36, 0xa1, 0xac, 0x66, 0x85, 0x45, 0x9c, 0xe4, 0x03, 0xc2, 0x3b,
-	0x26, 0x33, 0xf2, 0x6f, 0x81, 0x6a, 0xe0, 0xf6, 0xc9, 0x76, 0x60, 0x63, 0xe7, 0x50, 0xdb, 0x71,
-	0x48, 0xbb, 0xce, 0x4e, 0xb9, 0x24, 0xf2, 0x09, 0xe1, 0xdd, 0x32, 0x4d, 0xf2, 0x1f, 0x91, 0xea,
-	0x32, 0xec, 0xd3, 0x2d, 0xd1, 0xc6, 0xd3, 0x91, 0xf6, 0xf4, 0x80, 0xdc, 0xaf, 0xf5, 0x94, 0x77,
-	0x5c, 0x86, 0x5c, 0x7a, 0x17, 0xd3, 0x05, 0x45, 0xb3, 0x05, 0x45, 0x3f, 0x16, 0x14, 0x7d, 0x5c,
-	0x52, 0x6b, 0xb6, 0xa4, 0xd6, 0xb7, 0x25, 0xb5, 0x5e, 0x9d, 0x6c, 0x5c, 0x12, 0x8c, 0xf3, 0x43,
-	0x5a, 0x93, 0xbd, 0xdd, 0xa0, 0xd3, 0x37, 0x15, 0x34, 0xf5, 0xe7, 0xf2, 0xe8, 0x57, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xe7, 0x66, 0xdc, 0x9f, 0xc8, 0x03, 0x00, 0x00,
+	0x5a, 0xa9, 0xbd, 0xae, 0x77, 0x13, 0xd1, 0x2b, 0x37, 0x2e, 0x08, 0xc1, 0xd7, 0xf0, 0x07, 0x39,
+	0x46, 0xe2, 0x82, 0x38, 0x44, 0x28, 0xe1, 0x43, 0x90, 0x77, 0xd7, 0x49, 0x0c, 0x18, 0x72, 0xca,
+	0x6a, 0xf2, 0xe6, 0xbd, 0x37, 0x6f, 0xc6, 0xd8, 0x03, 0x75, 0x0e, 0x45, 0x9a, 0x64, 0x8a, 0x9d,
+	0x01, 0xa4, 0xbc, 0x18, 0x80, 0x62, 0xa3, 0x23, 0x76, 0x39, 0x84, 0xe2, 0xca, 0xcf, 0x0b, 0xa1,
+	0x04, 0xd9, 0x5e, 0x60, 0xfc, 0x05, 0xc6, 0x1f, 0x1d, 0xb9, 0x9d, 0x58, 0xc4, 0x42, 0x43, 0x58,
+	0xf9, 0x32, 0x68, 0xb7, 0xd7, 0xc0, 0xb8, 0x6c, 0x35, 0xb8, 0x7b, 0xb1, 0x10, 0xf1, 0x05, 0x30,
+	0x9e, 0x27, 0x8c, 0x67, 0x99, 0x50, 0x5c, 0x25, 0x22, 0x93, 0xe6, 0x5f, 0xaf, 0x83, 0xc9, 0x8b,
+	0xd2, 0xc2, 0x73, 0x5e, 0xf0, 0x54, 0x86, 0x70, 0x39, 0x04, 0xa9, 0xbc, 0x97, 0xf8, 0x4e, 0xad,
+	0x2a, 0x73, 0x91, 0x49, 0x20, 0x8f, 0x71, 0x3b, 0xd7, 0x95, 0xbb, 0xa8, 0x8b, 0x76, 0x6f, 0x1d,
+	0x53, 0xff, 0xef, 0x8e, 0x7d, 0xd3, 0x17, 0x5c, 0x1f, 0x4f, 0x77, 0x9c, 0xd0, 0xf6, 0x78, 0x5b,
+	0x96, 0x34, 0xe0, 0x12, 0x4e, 0x00, 0x2a, 0xad, 0xd7, 0xb8, 0x53, 0x2f, 0x5b, 0xb1, 0x27, 0x78,
+	0x33, 0xe2, 0x12, 0x4e, 0xcf, 0x00, 0xb4, 0xdc, 0xcd, 0x60, 0xff, 0xfb, 0x74, 0xa7, 0x17, 0x27,
+	0xea, 0x7c, 0x18, 0xf9, 0x7d, 0x91, 0xb2, 0xbe, 0x90, 0xa9, 0x90, 0xf6, 0xe7, 0x50, 0xbe, 0x19,
+	0x30, 0x75, 0x95, 0x83, 0xf4, 0x9f, 0x65, 0x2a, 0xdc, 0x88, 0x0c, 0x9d, 0xb7, 0x5d, 0xd1, 0x5f,
+	0x88, 0xfe, 0xe0, 0x29, 0x5f, 0x8c, 0xb8, 0x87, 0xb7, 0x7e, 0xab, 0x5b, 0xdd, 0xdb, 0xb8, 0x15,
+	0x73, 0x33, 0x61, 0x2b, 0x2c, 0x9f, 0xc7, 0x5f, 0x5a, 0xf8, 0x86, 0xc6, 0x92, 0xf7, 0x08, 0xb7,
+	0xcd, 0x6c, 0x64, 0xbf, 0x69, 0xf6, 0x3f, 0xe3, 0x74, 0x1f, 0xae, 0x85, 0x35, 0xfa, 0x5e, 0xef,
+	0xdd, 0xd7, 0x9f, 0x9f, 0xaf, 0x75, 0x09, 0x65, 0x0d, 0x0b, 0x36, 0x71, 0x92, 0x0f, 0x08, 0x6f,
+	0xd8, 0xcc, 0xc8, 0xbf, 0x05, 0xea, 0x81, 0xbb, 0x07, 0xeb, 0x81, 0xad, 0x9d, 0x5d, 0x6d, 0xc7,
+	0x23, 0xdd, 0x26, 0x3b, 0xd5, 0x92, 0xc8, 0x27, 0x84, 0x37, 0xab, 0x34, 0xc9, 0x7f, 0x44, 0xea,
+	0xcb, 0x70, 0x0f, 0xd7, 0x44, 0x5b, 0x4f, 0x7b, 0xda, 0xd3, 0x03, 0x72, 0xbf, 0xd1, 0x53, 0xd9,
+	0x71, 0x1a, 0x73, 0x19, 0x9c, 0x8c, 0x67, 0x14, 0x4d, 0x66, 0x14, 0xfd, 0x98, 0x51, 0xf4, 0x71,
+	0x4e, 0x9d, 0xc9, 0x9c, 0x3a, 0xdf, 0xe6, 0xd4, 0x79, 0x75, 0xb0, 0x72, 0x49, 0x30, 0x2a, 0x0f,
+	0x69, 0x49, 0xf6, 0x76, 0x85, 0x4e, 0xdf, 0x54, 0xd4, 0xd6, 0x9f, 0xcb, 0xa3, 0x5f, 0x01, 0x00,
+	0x00, 0xff, 0xff, 0x61, 0x3c, 0x39, 0xd8, 0xc8, 0x03, 0x00, 0x00,
 }

 // Reference imports to suppress errors if they are not otherwise used.