Merge branch 'develop' into cwgoes/mclaren-mcl33-first-pass

cosmos · Jan 2, 2019 · ff6ffe5 · ff6ffe5
2 parents c0babcc + 990f3ab
commit ff6ffe5
Show file tree

Hide file tree

Showing 206 changed files with 4,593 additions and 2,532 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,23 +1,51 @@
 version: 2
 
-defaults: &defaults
+defaults: &linux_defaults
   working_directory: /go/src/github.com/cosmos/cosmos-sdk
   docker:
-    - image: circleci/golang:1.11.1
+    - image: circleci/golang:1.11.4
   environment:
     GOBIN: /tmp/workspace/bin
 
+
+############
+#
+# Configure macos integration tests
+
+macos_config: &macos_defaults
+  macos:
+    xcode: "10.1.0"
+  working_directory: /Users/distiller/project/src/github.com/cosmos/cosmos-sdk
+  environment:
+    GO_VERSION: "1.11.4"
+
+set_macos_env: &macos_env
+  run:
+    name: Set environment
+    command: |
+      echo 'export PATH=$PATH:$HOME/go/bin' >> $BASH_ENV
+      echo 'export GOPATH=$HOME/project' >> $BASH_ENV
+      echo 'export GOBIN=$GOPATH/bin' >> $BASH_ENV
+      echo 'export PATH=$PATH:$HOME/go/bin:$GOBIN' >> $BASH_ENV
+
+############
+#
+# Configure docs deployment
+
 docs_update: &docs_deploy
   working_directory: ~/repo
   docker:
     - image: tendermint/docs_deployment
   environment:
     AWS_REGION: us-east-1
 
+
+############
+
 jobs:
 
   setup_dependencies:
-    <<: *defaults
+    <<: *linux_defaults
     steps:
       - run: mkdir -p /tmp/workspace/bin
       - run: mkdir -p /tmp/workspace/profiles
@@ -29,7 +57,7 @@ jobs:
           name: tools
           command: |
             export PATH="$GOBIN:$PATH"
-            make get_tools
+            make tools
       - run:
           name: dependencies
           command: |
@@ -48,7 +76,7 @@ jobs:
             - profiles
 
   lint:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -63,16 +91,15 @@ jobs:
           name: Get metalinter
           command: |
             export PATH="$GOBIN:$PATH"
-            make get_tools
-            make get_dev_tools
+            make devtools
       - run:
           name: Lint source
           command: |
             export PATH="$GOBIN:$PATH"
             make test_lint
 
   integration_tests:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -91,7 +118,7 @@ jobs:
             make test_examples
 
   test_sim_gaia_nondeterminism:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -109,7 +136,7 @@ jobs:
             make test_sim_gaia_nondeterminism
 
   test_sim_gaia_fast:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -127,7 +154,7 @@ jobs:
             make test_sim_gaia_fast
 
   test_sim_gaia_import_export:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -145,7 +172,7 @@ jobs:
             make test_sim_gaia_import_export
 
   test_sim_gaia_simulation_after_import:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -163,7 +190,7 @@ jobs:
             make test_sim_gaia_simulation_after_import
 
   test_sim_gaia_multi_seed:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -181,7 +208,7 @@ jobs:
             scripts/multisim.sh 25 TestFullGaiaSimulation
 
   test_cover:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 4
     steps:
       - attach_workspace:
@@ -211,7 +238,7 @@ jobs:
           path: /tmp/logs
 
   upload_coverage:
-    <<: *defaults
+    <<: *linux_defaults
     parallelism: 1
     steps:
       - attach_workspace:
@@ -244,20 +271,21 @@ jobs:
         GOPATH: /home/circleci/.go_workspace/
         GOOS: linux
         GOARCH: amd64
+        GO_VERSION: "1.11.4"
       parallelism: 1
       steps:
         - checkout
         - run:
             name: run localnet and exit on failure
             command: |
               pushd /tmp
-              wget https://dl.google.com/go/go1.11.linux-amd64.tar.gz
-              sudo tar -xvf go1.11.linux-amd64.tar.gz
+              wget https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz
+              sudo tar -xvf go$GO_VERSION.linux-amd64.tar.gz
               sudo rm -rf /usr/local/go
               sudo mv go /usr/local
               popd
               set -x
-              make get_tools
+              make tools
               make get_vendor_deps
               make build-linux
               make localnet-start
@@ -271,10 +299,47 @@ jobs:
           command: |
             chamber exec cosmos-sdk -- start_website_build
 
+  macos_ci:
+    <<: *macos_defaults
+    steps:
+      - *macos_env
+      - run:
+          name: Install go
+          command: |
+            source $BASH_ENV
+            curl -L -O https://dl.google.com/go/go$GO_VERSION.darwin-amd64.tar.gz
+            tar -C $HOME -xzf go$GO_VERSION.darwin-amd64.tar.gz
+            rm go$GO_VERSION.darwin-amd64.tar.gz
+            go version
+      - checkout
+      - run:
+          name: Install SDK
+          command: |
+            source $BASH_ENV
+            make tools
+            make get_vendor_deps
+            make install
+      - run:
+          name: Integration tests
+          command:
+            source $BASH_ENV
+            make test_cli
+      - run:
+          name: Test full gaia simulation
+          command: |
+            source $BASH_ENV
+            make test_sim_gaia_fast
+
 workflows:
   version: 2
   test-suite:
     jobs:
+      - macos_ci:
+          filters:
+            branches:
+              only:
+                - master
+                - develop
       - deploy_docs:
           filters:
             branches:

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+client/lcd/swagger-ui/* linguist-vendored
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,8 @@ build
 tools/bin/*
 examples/build/*
 docs/_build
+docs/tutorial
+dist
 
 # Data - ideally these don't exist
 examples/basecoin/app/data

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,52 @@
 # Changelog
 
+## 0.29.0
+
+BREAKING CHANGES
+
+* Gaia
+  * [\#3148](https://github.com/cosmos/cosmos-sdk/issues/3148) Fix `gaiad export` by adding a boolean to `NewGaiaApp` determining whether or not to load the latest version
+
+* SDK
+  * [\#3163](https://github.com/cosmos/cosmos-sdk/issues/3163) Withdraw commission on self bond removal
+
+
+## 0.28.1
+
+BREAKING CHANGES
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+  * [lcd] [\#3045](https://github.com/cosmos/cosmos-sdk/pull/3045) Fix quoted json return on GET /keys (keys list)
+  * [gaia-lite] [\#2191](https://github.com/cosmos/cosmos-sdk/issues/2191) Split `POST /stake/delegators/{delegatorAddr}/delegations` into `POST /stake/delegators/{delegatorAddr}/delegations`, `POST /stake/delegators/{delegatorAddr}/unbonding_delegations` and `POST /stake/delegators/{delegatorAddr}/redelegations`
+  * [gaia-lite] [\#3056](https://github.com/cosmos/cosmos-sdk/pull/3056) `generate_only` and `simulate` have moved from query arguments to POST requests body.
+* Tendermint
+  * [tendermint] Now using Tendermint 0.27.3
+
+FEATURES
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+  * [slashing] [\#2399](https://github.com/cosmos/cosmos-sdk/issues/2399)  Implement `/slashing/parameters` endpoint to query slashing parameters.
+* Gaia CLI  (`gaiacli`)
+  * [gaiacli] [\#2399](https://github.com/cosmos/cosmos-sdk/issues/2399) Implement `params` command to query slashing parameters.
+* SDK
+  - [client] [\#2926](https://github.com/cosmos/cosmos-sdk/issues/2926) Add TxEncoder to client TxBuilder.
+* Other
+  - Introduced the logjack tool for saving logs w/ rotation
+
+IMPROVEMENTS
+
+* Gaia REST API (`gaiacli advanced rest-server`)
+  * [\#2879](https://github.com/cosmos/cosmos-sdk/issues/2879), [\#2880](https://github.com/cosmos/cosmos-sdk/issues/2880) Update deposit and vote endpoints to perform a direct txs query
+    when a given proposal is inactive and thus having votes and deposits removed
+    from state.
+* Gaia CLI  (`gaiacli`)
+  * [\#2879](https://github.com/cosmos/cosmos-sdk/issues/2879), [\#2880](https://github.com/cosmos/cosmos-sdk/issues/2880) Update deposit and vote CLI commands to perform a direct txs query
+    when a given proposal is inactive and thus having votes and deposits removed
+    from state.
+* Gaia
+  * [\#3021](https://github.com/cosmos/cosmos-sdk/pull/3021) Add `--gentx-dir` to `gaiad collect-gentxs` to specify a directory from which collect and load gentxs. Add `--output-document` to `gaiad init` to allow one to redirect output to file.
+
+
 ## 0.28.0
 
 BREAKING CHANGES

diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ COPY . .
 
 # Install minimum necessary dependencies, build Cosmos SDK, remove packages
 RUN apk add --no-cache $PACKAGES && \
-    make get_tools && \
+    make tools && \
     make get_vendor_deps && \
     make build && \
     make install

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -40,7 +40,7 @@
 
 [[override]]
   name = "github.com/tendermint/tendermint"
-  revision = "v0.27.0"
+  revision = "v0.27.3"
 
 [[constraint]]
   name = "github.com/zondax/ledger-cosmos-go"