Merge branch 'develop' into jack/add-offline-pubkeys

Author: jackzampolin

.circleci/config.yml

@@ -39,30 +39,28 @@ docs_update: &docs_deploy
   environment:
     AWS_REGION: us-east-1
 
-
 ############
 
-jobs:
+deps: &dependencies
+  run:
+    name: dependencies
+    command: |
+      export PATH="$GOBIN:$PATH"
+      make get_vendor_deps
 
+jobs:
   setup_dependencies:
     <<: *linux_defaults
     steps:
       - run: mkdir -p /tmp/workspace/bin
       - run: mkdir -p /tmp/workspace/profiles
       - checkout
-      - restore_cache:
-          keys:
-            - v1-pkg-cache
       - run:
           name: tools
           command: |
             export PATH="$GOBIN:$PATH"
             make tools
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: binaries
           command: |
@@ -82,11 +80,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Get metalinter
           command: |
@@ -105,11 +99,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Test cli
           command: |
@@ -124,11 +114,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Test individual module simulations
           command: |
@@ -142,11 +128,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Test full Gaia simulation
           command: |
@@ -160,11 +142,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Test Gaia import/export simulation
           command: |
@@ -178,34 +156,40 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: Test Gaia import/export simulation
           command: |
             export PATH="$GOBIN:$PATH"
             make test_sim_gaia_simulation_after_import
 
-  test_sim_gaia_multi_seed:
+  test_sim_gaia_multi_seed_long:
     <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
+      - *dependencies
       - run:
-          name: dependencies
+          name: Test multi-seed Gaia simulation long
           command: |
             export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+            scripts/multisim.sh 800 50 TestFullGaiaSimulation
+
+  test_sim_gaia_multi_seed:
+    <<: *linux_defaults
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: /tmp/workspace
+      - checkout
+      - *dependencies
       - run:
-          name: Test multi-seed Gaia simulation
+          name: Test multi-seed Gaia simulation short
           command: |
             export PATH="$GOBIN:$PATH"
-            scripts/multisim.sh 25 TestFullGaiaSimulation
+            scripts/multisim.sh 50 10 TestFullGaiaSimulation
 
   test_cover:
     <<: *linux_defaults
@@ -214,11 +198,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run: mkdir -p /tmp/logs
       - run:
           name: Run tests
@@ -244,11 +224,7 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - checkout
-      - run:
-          name: dependencies
-          command: |
-            export PATH="$GOBIN:$PATH"
-            make get_vendor_deps
+      - *dependencies
       - run:
           name: gather
           command: |
@@ -368,6 +344,14 @@ workflows:
       - test_sim_gaia_multi_seed:
           requires:
             - setup_dependencies
+      - test_sim_gaia_multi_seed_long:
+          requires:
+            - setup_dependencies
+          filters:
+            branches:
+              only:
+                - master
+                - develop
       - test_cover:
           requires:
             - setup_dependencies

PENDING.md

@@ -22,6 +22,7 @@ BREAKING CHANGES
 
 * SDK
   * [stake] \#2513 Validator power type from Dec -> Int
+  * [stake] \#3233 key and value now contain duplicate fields to simplify code
   * [\#3064](https://github.com/cosmos/cosmos-sdk/issues/3064) Sanitize `sdk.Coin` denom. Coins denoms are now case insensitive, i.e. 100fooToken equals to 100FOOTOKEN.
 
 * Tendermint
@@ -56,11 +57,13 @@ IMPROVEMENTS
 
 * Gaia REST API
   * [\#3176](https://github.com/cosmos/cosmos-sdk/issues/3176) Validate tx/sign endpoint POST body.
+  * [\#2948](https://github.com/cosmos/cosmos-sdk/issues/2948) Swagger UI now makes requests to light client node
 
 * Gaia CLI  (`gaiacli`)
   * [\#3224](https://github.com/cosmos/cosmos-sdk/pull/3224) Support adding offline public keys to the keystore
 
 * Gaia
+  * [\#2186](https://github.com/cosmos/cosmos-sdk/issues/2186) Add Address Interface
   * [\#3158](https://github.com/cosmos/cosmos-sdk/pull/3158) Validate slashing genesis
   * [\#3172](https://github.com/cosmos/cosmos-sdk/pull/3172) Support minimum fees
   in a local testnet.
@@ -75,8 +78,8 @@ IMPROVEMENTS
 * Tendermint
 
 * CI
-    * \#2498 Added macos CI job to CircleCI
-
+  * \#2498 Added macos CI job to CircleCI
+  * [#142](https://github.com/tendermint/devops/issues/142) Increased the number of blocks to be tested during multi-sim 
 
 BUG FIXES
 
@@ -90,6 +93,7 @@ BUG FIXES
   * \#3181 Correctly reset total accum update height and jailed-validator bond height / unbonding height on export-for-zero-height
   * [\#3172](https://github.com/cosmos/cosmos-sdk/pull/3172) Fix parsing `gaiad.toml`
   when it already exists.
+  * \#3223 Fix unset governance proposal queues when importing state from old chain
   * [#3187](https://github.com/cosmos/cosmos-sdk/issues/3187) Fix `gaiad export`
   by resetting each validator's slashing period.
 

client/lcd/swagger-ui/swagger.yaml

@@ -18,11 +18,12 @@ tags:
 - name: ICS23
   description: Slashing module APIs
 - name: ICS24
-  description: Fee distribution module APIs
+  description: WIP - Fee distribution module APIs
 - name: version
   description: Query app version
 schemes:
 - https
+host: fabo.interblock.io:1317
 securityDefinitions:
   kms:
     type: basic
@@ -796,20 +797,20 @@ paths:
   /stake/redelegations:
     parameters:
     - in: query
-        name: delegator
-        description: Bech32 AccAddress of Delegator
-        required: false
-        type: string
+      name: delegator
+      description: Bech32 AccAddress of Delegator
+      required: false
+      type: string
     - in: query
-        name: validator_from
-        description: Bech32 ValAddress of SrcValidator
-        required: false
-        type: string
+      name: validator_from
+      description: Bech32 ValAddress of SrcValidator
+      required: false
+      type: string
     - in: query
-        name: validator_to
-        description: Bech32 ValAddress of DstValidator
-        required: false
-        type: string
+      name: validator_to
+      description: Bech32 ValAddress of DstValidator
+      required: false
+      type: string
     get:
       summary: Get all redelegations (filter by query params)
       tags:

docs/DOCS_README.md

@@ -66,25 +66,25 @@ to send users to the GitHub.
 
 To build and serve the documentation locally, run:
 
-```
+```bash
 npm install -g vuepress
 ```
 
 then change the following line in the `config.js`:
 
-```
+```js
 base: "/docs/",
 ```
 
 to:
 
-```
+```js
 base: "/",
 ```
 
 Finally, go up one directory to the root of the repo and run:
 
-```
+```bash
 # from root of repo
 vuepress build docs
 cd dist/docs
@@ -113,14 +113,14 @@ much as possible with its [counterpart in the Tendermint Core repo](https://gith
 ### Update and Build the RPC docs
 
 1. Execute the following command at the root directory to install the swagger-ui generate tool.
-    ```
+    ```bash
     make tools
     ```
 2. Edit API docs
     1. Directly Edit API docs manually: `client/lcd/swagger-ui/swagger.yaml`.
-    2. Edit API docs within [SwaggerHub](https://app.swaggerhub.com). Please refer to this [document](https://app.swaggerhub.com/help/index) for how to use the about website to edit API docs.
+    2. Edit API docs within the [Swagger Editor](https://editor.swagger.io/). Please refer to this [document](https://swagger.io/docs/specification/2-0/basic-structure/) for the correct structure in `.yaml`.
 3. Download `swagger.yaml` and replace the old `swagger.yaml` under fold `client/lcd/swagger-ui`.
 4. Compile gaiacli
-    ```
+    ```bash
     make install
     ```