Merge branch 'main' into fix/ica-middleware-typo

cosmos · May 24, 2022 · 992b577 · 992b577
2 parents 473d845 + 1acb3cc
commit 992b577
Show file tree

Hide file tree

Showing 3 changed files with 6,785 additions and 3,572 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 # CODEOWNERS: https://help.github.com/articles/about-codeowners/
 
-*       @colin-axner @AdityaSripal @crodriguezvega @seantking @charleenfei @damiannolan
+*       @colin-axner @AdityaSripal @crodriguezvega @seantking @charleenfei @damiannolan @chatton
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only
@@ -14,19 +14,24 @@
 # CODEOWNERS for the core IBC module
 
 /modules/core/ @colin-axner @fedekunze @AdityaSripal 
-/proto/core/ @colin-axner @fedekunze @AdityaSripal 
+/proto/ibc/core/ @colin-axner @fedekunze @AdityaSripal 
 
 # CODEOWNERS for the light-clients
 
 /modules/light-clients/ @colin-axner @fedekunze @AdityaSripal 
-/proto/lightclients/ @colin-axner @fedekunze @AdityaSripal 
+/proto/ibc/lightclients/ @colin-axner @fedekunze @AdityaSripal 
 
 # CODEOWNERS for ICS 20
 
 /modules/apps/transfer/ @colin-axner @fedekunze @AdityaSripal 
-/proto/applications/transfer/ @colin-axner @fedekunze @AdityaSripal 
+/proto/ibc/applications/transfer/ @colin-axner @fedekunze @AdityaSripal 
 
 # CODEOWNERS for interchain-accounts module
 
 /modules/apps/27-interchain-accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
-/proto/applications/interchain_accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
+/proto/ibc/applications/interchain_accounts/ @seantking @colin-axner @AdityaSripal @damiannolan
+
+# CODEOWNERS for fee module
+
+/modules/apps/29-fee/ @AdityaSripal @seantking @charleenfei @colin-axner @damiannolan 
+/proto/ibc/applications/fee/ @AdityaSripal @seantking @charleenfei @colin-axner @damiannolan
diff --git a/docs/client/config.json b/docs/client/config.json
@@ -30,6 +30,14 @@
         }
       }
     },
+    {
+      "url": "./tmp-swagger-gen/ibc/applications/fee/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "FeeParams"
+        }
+      }
+    },
     {
       "url": "./tmp-swagger-gen/ibc/core/client/v1/query.swagger.json",
       "operationIds": {