Merge branch 'master' into gov_split_vote_weighted_vote

build.sh → .build.sh

@@ -11,7 +11,7 @@ set -ue
 # - DEBUG
 
 # Source builder's functions library
-. /usr/local/share/cosmos-sdk/buildlib.sh
+. /usr/local/share/tendermint/buildlib.sh
 
 # These variables are now available
 # - BASEDIR

.github/workflows/linkchecker.yml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.8
+      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.12
         with:
           folder-path: "docs"

.github/workflows/test.yml

@@ -152,7 +152,7 @@ jobs:
             sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
           done
         if: env.GIT_DIFF
-      - uses: codecov/codecov-action@v1.0.15
+      - uses: codecov/codecov-action@v1.2.1
         with:
           file: ./coverage.txt
         if: env.GIT_DIFF

CONTRIBUTING.md

@@ -218,7 +218,7 @@ only pull requests targeted directly against master.
 ### Development Procedure
 
 - the latest state of development is on `master`
-- `master` must never fail `make test` or `make test_cli`
+- `master` must never fail `make lint test test-race`
 - `master` should not fail `make lint`
 - no `--force` onto `master` (except when reverting a broken commit, which should seldom happen)
 - create a development branch either on github.com/cosmos/cosmos-sdk, or your fork (using `git remote add origin`)
@@ -227,7 +227,7 @@ only pull requests targeted directly against master.
 ### Pull Merge Procedure
 
 - ensure pull branch is rebased on `master`
-- run `make test` and `make test_cli` to ensure that all tests pass
+- run `make test` to ensure that all tests pass
 - merge pull request
 
 ### Release Procedure
@@ -306,9 +306,11 @@ new code owners is as follows: On a bi-monthly basis (or more frequently if
 agreeable) all the existing code owners will privately convene to discuss
 potential new candidates as well as the potential for existing code-owners to
 exit or "pass on the torch". This private meeting is to be a held as a
-phone/video meeting. Subsequently at the end of the meeting, one of the existing
-code owners should open a PR modifying the `CODEOWNERS` file. The other code
-owners should then all approve this PR to publicly display their support.
+phone/video meeting.
+
+Subsequently after the meeting, and pending final approval from the ICF,
+one of the existing code owners should open a PR modifying the `CODEOWNERS` file.
+The other code owners should then all approve this PR to publicly display their support.
 
 Only if unanimous consensus is reached among all the existing code-owners will
 an invitation be extended to a new potential-member. Likewise, when an existing
@@ -318,6 +320,95 @@ should be taken. If however, a code-owner is demonstrably shown to intentionally
 have had acted maliciously or grossly negligent, code-owner privileges may be
 stripped with no prior warning or consent from the member in question.
 
+Other potential removal criteria:
+  * Missing 3 scheduled meetings results in ICF evaluating whether the member should be
+    removed / replaced
+  * Violation of Code of Conduct
+
 Earning this privilege should be considered to be no small feat and is by no
 means guaranteed by any quantifiable metric. It is a symbol of great trust of
 the community of this project.
+
+
+## Concept & Release Approval Process
+
+The process for how Cosmos SDK maintainers take features and ADRs from concept to release
+is broken up into three distinct stages: **Strategy Discovery**, **Concept Approval**, and 
+**Implementation & Release Approval**
+
+
+### Strategy Discovery
+
+* Develop long term priorities, strategy and roadmap for the SDK
+* Release committee not yet defined as there is already a roadmap that can be used for the time being
+
+### Concept Approval
+
+* Architecture Decision Records (ADRs) may be proposed by any contributors or maintainers of the Cosmos SDK,
+    and should follow the guidelines outlined in the
+    [ADR Creation Process](https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/PROCESS.md)
+* After proposal, a time bound period for Request for Comment (RFC) on ADRs commences
+* ADRs are intended to be iterative, and may be merged into `master` while still in a `Proposed` status
+
+**Time Bound Period**
+
+* Once a PR for an ADR is opened, reviewers are expected to perform a first
+  review within 1 week of pull request being open
+* Time bound period for individual ADR Pull Requests to be merged should not exceed 2 weeks
+* Total time bound period for an ADR to reach a decision (`ABANDONED | ACCEPTED | REJECTED`) should not exceed 4 weeks
+
+If an individual Pull Request for an ADR needs more time than 2 weeks to reach resolution, it should be merged
+in current state (`Draft` or `Proposed`), with its contents updated to summarize
+the current state of its discussion.
+
+If an ADR is taking longer than 4 weeks to reach a final conclusion, the **Concept Approval Committee** 
+should convene to rectify the situation by either:
+- unanimously setting a new time bound period for this ADR
+- making changes to the Concept Approval Process (as outlined here)
+- making changes to the members of the Concept Approval Committee
+
+**Approval Committee & Decision Making**
+
+In absense of general consensus, decision making requires ⅔ vote from the three members
+of the **Concept Approval Committee**.
+
+**Committee Members**
+
+* Core Members: **Aaron** (Regen), **Bez** (Fission), **Alessio** (AiB)
+* Secondary pool of candidates to replace / substitute:
+    * **Chris Goes** (IG), **Sunny** (Sikka)
+
+**Committee Criteria**
+
+Members must:
+
+* Participate in all or almost all ADR discussions, both on Github as well as in bi-weekly Architecture Review
+  meetings
+* Be active contributors to the SDK, and furthermore should be continuously making substantial contributions
+  to the project's codebase, review process, documentation and ADRs
+* Have stake in the Cosmos SDK project, represented by:
+  * Being a client / user of the Comsos SDK
+  * "[giving back](https://www.debian.org/social_contract)" to the software
+* Delegate representation in case of vacation or absence
+
+Code owners need to maintain participation in the process, ideally as members of **Concept Approval Committee**
+members, but at the very least as active participants in ADR discussions
+
+Removal criteria:
+
+* Missing 3 meetings results in ICF evaluating whether the member should be removed / replaced
+* Violation of Code of Conduct
+
+### Implementation & Release Approval
+
+The following process should be adhered to both for implementation PRs corresponding to ADRs, as
+well as for PRs made as part of a release process:
+
+* Code reviewers should ensure the PR does exactly what the ADR said it should
+* Code reviewers should have more senior engineering capability
+* ⅔ approval is required from the **primary repo maintainers** in `CODEOWNERS`
+  * Secondary pool of candidates to replace / substitute are listed as **secondary repo maintainers** in `CODEOWNERS`
+ 
+*Note: For any major or minor release series denoted as a "Stable Release" (e.g. v0.39 "Launchpad"), a separate release
+committee is often established. Stable Releases, and their corresponding release committees are documented
+separately in [STABLE_RELEASES.md](./STABLE_RELEASES.md)*

Makefile

@@ -176,6 +176,16 @@ go.sum: go.mod
 ###                              Documentation                              ###
 ###############################################################################
 
+update-swagger-docs: statik
+	$(BINDIR)/statik -src=client/docs/swagger-ui -dest=client/docs -f -m
+	@if [ -n "$(git status --porcelain)" ]; then \
+        echo "\033[91mSwagger docs are out of sync!!!\033[0m";\
+        exit 1;\
+    else \
+        echo "\033[92mSwagger docs are in sync\033[0m";\
+    fi
+.PHONY: update-swagger-docs
+
 godocs:
 	@echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/cosmos/cosmos-sdk/types"
 	godoc -http=:6060

baseapp/abci.go

@@ -286,7 +286,7 @@ func (app *BaseApp) Commit() (res abci.ResponseCommit) {
 	header := app.deliverState.ctx.BlockHeader()
 	retainHeight := app.GetBlockRetentionHeight(header.Height)
 
-	// Write the DeliverTx state which is cache-wrapped and commit the MultiStore.
+	// Write the DeliverTx state into branched storage and commit the MultiStore.
 	// The write to the DeliverTx state writes all state transitions to the root
 	// MultiStore (app.cms) so when Commit() is called is persists those values.
 	app.deliverState.ms.Write()
@@ -629,7 +629,7 @@ func (app *BaseApp) createQueryContext(height int64, prove bool) (sdk.Context, e
 			)
 	}
 
-	// cache wrap the commit-multistore for safety
+	// branch the commit-multistore for safety
 	ctx := sdk.NewContext(
 		cacheMS, app.checkState.ctx.BlockHeader(), true, app.logger,
 	).WithMinGasPrices(app.minGasPrices)

baseapp/baseapp.go

@@ -357,8 +357,8 @@ func (app *BaseApp) Seal() { app.sealed = true }
 // IsSealed returns true if the BaseApp is sealed and false otherwise.
 func (app *BaseApp) IsSealed() bool { return app.sealed }
 
-// setCheckState sets the BaseApp's checkState with a cache-wrapped multi-store
-// (i.e. a CacheMultiStore) and a new Context with the cache-wrapped multi-store,
+// setCheckState sets the BaseApp's checkState with a branched multi-store
+// (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
 // provided header, and minimum gas prices set. It is set on InitChain and reset
 // on Commit.
 func (app *BaseApp) setCheckState(header tmproto.Header) {
@@ -369,8 +369,8 @@ func (app *BaseApp) setCheckState(header tmproto.Header) {
 	}
 }
 
-// setDeliverState sets the BaseApp's deliverState with a cache-wrapped multi-store
-// (i.e. a CacheMultiStore) and a new Context with the cache-wrapped multi-store,
+// setDeliverState sets the BaseApp's deliverState with a branched multi-store
+// (i.e. a CacheMultiStore) and a new Context with the same multi-store branch,
 // and provided header. It is set on InitChain and BeginBlock and set to nil on
 // Commit.
 func (app *BaseApp) setDeliverState(header tmproto.Header) {
@@ -532,7 +532,7 @@ func (app *BaseApp) getContextForTx(mode runTxMode, txBytes []byte) sdk.Context
 }
 
 // cacheTxContext returns a new context based off of the provided context with
-// a cache wrapped multi-store.
+// a branched multi-store.
 func (app *BaseApp) cacheTxContext(ctx sdk.Context, txBytes []byte) (sdk.Context, sdk.CacheMultiStore) {
 	ms := ctx.MultiStore()
 	// TODO: https://github.com/cosmos/cosmos-sdk/issues/2824
@@ -620,7 +620,7 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
 			msCache sdk.CacheMultiStore
 		)
 
-		// Cache wrap context before AnteHandler call in case it aborts.
+		// Branch context before AnteHandler call in case it aborts.
 		// This is required for both CheckTx and DeliverTx.
 		// Ref: https://github.com/cosmos/cosmos-sdk/issues/2772
 		//
@@ -632,9 +632,8 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
 		newCtx, err := app.anteHandler(anteCtx, tx, mode == runTxModeSimulate)
 
 		if !newCtx.IsZero() {
-			// At this point, newCtx.MultiStore() is cache-wrapped, or something else
-			// replaced by the AnteHandler. We want the original multistore, not one
-			// which was cache-wrapped for the AnteHandler.
+			// At this point, newCtx.MultiStore() is a store branch, or something else
+			// replaced by the AnteHandler. We want the original multistore.
 			//
 			// Also, in the case of the tx aborting, we need to track gas consumed via
 			// the instantiated gas meter in the AnteHandler, so we update the context
@@ -654,9 +653,9 @@ func (app *BaseApp) runTx(mode runTxMode, txBytes []byte) (gInfo sdk.GasInfo, re
 		msCache.Write()
 	}
 
-	// Create a new Context based off of the existing Context with a cache-wrapped
-	// MultiStore in case message processing fails. At this point, the MultiStore
-	// is doubly cached-wrapped.
+	// Create a new Context based off of the existing Context with a MultiStore branch
+	// in case message processing fails. At this point, the MultiStore
+	// is a branch of a branch.
 	runMsgCtx, msCache := app.cacheTxContext(ctx, txBytes)
 
 	// Attempt to execute all messages and only update state if all messages pass

baseapp/params.go

@@ -64,7 +64,7 @@ func ValidateEvidenceParams(i interface{}) error {
 	}
 
 	if v.MaxBytes < 0 {
-		return fmt.Errorf("maximum evidence bytes must be positive: %v", v.MaxBytes)
+		return fmt.Errorf("maximum evidence bytes must be non-negative: %v", v.MaxBytes)
 	}
 
 	return nil

baseapp/params_test.go

@@ -37,7 +37,10 @@ func TestValidateEvidenceParams(t *testing.T) {
 		{&tmproto.EvidenceParams{}, true},
 		{tmproto.EvidenceParams{}, true},
 		{tmproto.EvidenceParams{MaxAgeNumBlocks: -1, MaxAgeDuration: 18004000, MaxBytes: 5000000}, true},
+		{tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: -1, MaxBytes: 5000000}, true},
+		{tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: -1}, true},
 		{tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 5000000}, false},
+		{tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 0}, false},
 	}
 
 	for _, tc := range testCases {

client/broadcast.go

@@ -95,23 +95,14 @@ func (ctx Context) BroadcastTxCommit(txBytes []byte) (*sdk.TxResponse, error) {
 	}
 
 	res, err := node.BroadcastTxCommit(context.Background(), txBytes)
-	if err != nil {
-		if errRes := CheckTendermintError(err, txBytes); errRes != nil {
-			return errRes, nil
-		}
-
-		return sdk.NewResponseFormatBroadcastTxCommit(res), err
-	}
-
-	if !res.CheckTx.IsOK() {
+	if err == nil {
 		return sdk.NewResponseFormatBroadcastTxCommit(res), nil
 	}
 
-	if !res.DeliverTx.IsOK() {
-		return sdk.NewResponseFormatBroadcastTxCommit(res), nil
+	if errRes := CheckTendermintError(err, txBytes); errRes != nil {
+		return errRes, nil
 	}
-
-	return sdk.NewResponseFormatBroadcastTxCommit(res), nil
+	return sdk.NewResponseFormatBroadcastTxCommit(res), err
 }
 
 // BroadcastTxSync broadcasts transaction bytes to a Tendermint node