Merge branch 'rc/v0.48.0-rcx' into feat/compatibility_with_cosmos

* rc/v0.48.0-rcx: feat: add tendermint query apis for compatibility with cosmos-sdk (Finschia#1087) # Conflicts: # CHANGELOG.md
zemyblue · Aug 22, 2023 · f8d06b8 · f8d06b8
2 parents da48471 + 4e315d6
commit f8d06b8
Show file tree

Hide file tree

Showing 20 changed files with 34,464 additions and 24,183 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/auth) [\#1011](https://github.com/Finschia/finschia-sdk/pull/1011) add the api for querying next account number
 * (server/grpc) [\#1017](https://github.com/Finschia/finschia-sdk/pull/1017) support custom r/w gRPC options (backport cosmos/cosmos-sdk#11889)
 * (x/auth) [\#1085](https://github.com/Finschia/finschia-sdk/pull/1085) rollback GetBlockWithTxs of cosmos service.proto for compatibility with cosmos-sdk APIs
+* (proto) [\#1087](https://github.com/Finschia/finschia-sdk/pull/1087) add tendermint query apis for compatibility with cosmos-sdk
 
 ### Improvements
 * (third_party/proto) [\#1037](https://github.com/Finschia/finschia-sdk/pull/1037) change the proof.proto path to third_party/proto/confio

diff --git a/client/docs/config.json b/client/docs/config.json
@@ -24,6 +24,21 @@
     },
     {
       "url": "./tmp-swagger-gen/lbm/base/ostracon/v1/query.swagger.json",
+      "operationIds": {
+        "rename": {
+          "Params": "OstraconBaseParams",
+          "GetLatestBlock": "GetLatestBlock2",
+          "GetLastBlock": "GetLastBlock2",
+          "GetBlockByHeight": "GetBlockByHeight2",
+          "GetNodeInfo": "GetNodeInfo2",
+          "GetSyncing": "GetSyncing2",
+          "GetLatestValidatorSet": "GetLatestValidatorSet2",
+          "GetValidatorSetByHeight": "GetValidatorSetByHeight2"
+        }
+      }
+    },
+    {
+      "url": "./tmp-swagger-gen/cosmos/base/tendermint/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "BaseParams"

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go