Skip to content

Commit

Permalink
Merge pull request cosmos#9 from dogemos/develop
Browse files Browse the repository at this point in the history
sync changes
  • Loading branch information
dogemos committed Sep 27, 2019
2 parents 6bff708 + 19cd8e9 commit 950de30
Show file tree
Hide file tree
Showing 723 changed files with 37,067 additions and 26,142 deletions.
291 changes: 207 additions & 84 deletions .circleci/config.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
client/lcd/swagger-ui/* linguist-vendored
4 changes: 3 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
* @ebuchman @rigelrozanski @cwgoes

# Precious documentation
/docs/ @zramsay @jolesbi
/docs/README.md @zramsay
/docs/DOCS_README.md @zramsay
/docs/.vuepress/ @zramsay
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ v If a checkbox is n/a - please still include it but + a little note why
- [ ] Linked to github-issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Wrote tests
- [ ] Updated relevant documentation (`docs/`)
- [ ] Added entries in `PENDING.md` with issue #
- [ ] Added a relevant changelog entry: `sdkch add [section] [stanza] [message]`
- [ ] rereviewed `Files changed` in the github PR explorer

______
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@

# Build
vendor
vendor-deps
.vendor-new
build
tools/bin/*
examples/build/*
docs/_build
docs/tutorial
dist
devtools-stamp

# Data - ideally these don't exist
examples/basecoin/app/data
baseapp/data/*
client/lcd/keys/*
client/lcd/statik/statik.go
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3837 Fix `WithdrawValidatorCommission` to properly set the validator's remaining commission.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3813 New sdk.NewCoins safe constructor to replace bare sdk.Coins{} declarations.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3808 `gaiad` and `gaiacli` integration tests use ./build/ binaries.
7 changes: 7 additions & 0 deletions .pending/improvements/gaia/3819-Simulation-refa
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
\#3819 Simulation refactor, log output now stored in ~/.gaiad/simulation/
* Simulation moved to its own module (not a part of mock)
* Logger type instead of passing function variables everywhere
* Logger json output (for reloadable simulation running)
* Cleanup bank simulation messages / remove dup code in bank simulation
* Simulations saved in `~/.gaiad/simulations/`
* "Lean" simulation output option to exclude No-ops and !ok functions (`--SimulationLean` flag)
1 change: 1 addition & 0 deletions .pending/improvements/gaiacli/3841-Add-indent-to-J
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3841 Add indent to JSON of `gaiacli keys [add|show|list]`
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3859 Add newline to echo of `gaiacli keys ...`
1 change: 1 addition & 0 deletions .pending/improvements/sdk/3801-baseapp-safety-improvements
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3801 `baseapp` safety improvements
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3820 Make Coins.IsAllGT() more robust and consistent.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3828 New sdkch tool to maintain changelogs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#3864 Make Coins.IsAllGTE() more consistent.
454 changes: 451 additions & 3 deletions CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ If you open a PR on the Cosmos SDK, it is mandatory to update the relevant docum

* If your change relates to the core SDK (baseapp, store, ...), please update the docs/gaia folder, the docs/examples folder and possibly the docs/spec folder.
* If your changes relate specifically to the gaia application (not including modules), please modify the docs/gaia folder.
* If your changes relate to a module, please update the module's spec in docs/spec. If the module is used by gaia and/or basecoin, you might also need to modify docs/gaia and/or docs/examples.
* If your changes relate to a module, please update the module's spec in docs/spec. If the module is used by gaia, you might also need to modify docs/gaia and/or docs/examples.
* If your changes relate to the core of the CLI or Light-client (not specifically to module's CLI/Rest), please modify the docs/clients folder.

## Forking
Expand All @@ -85,7 +85,7 @@ For instance, to create a fork and work on a branch of it, I would:
- Create the fork on github, using the fork button.
- Go to the original repo checked out locally (i.e. `$GOPATH/src/github.com/cosmos/cosmos-sdk`)
- `git remote rename origin upstream`
- `git remote add origin git@github.com:ebuchman/basecoin.git`
- `git remote add origin git@github.com:ebuchman/cosmos-sdk.git`

Now `origin` refers to my fork and `upstream` refers to the Cosmos-SDK version.
So I can `git push -u origin master` to update my fork, and make pull requests to Cosmos-SDK from there.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ COPY . .

# Install minimum necessary dependencies, build Cosmos SDK, remove packages
RUN apk add --no-cache $PACKAGES && \
make get_tools && \
make get_vendor_deps && \
make tools && \
make vendor-deps && \
make build && \
make install

Expand Down
Loading

0 comments on commit 950de30

Please sign in to comment.