Merge branch 'master' into roman/upstream/snapshot-pruning-refactor

Author: p0mvn

CHANGELOG.md

@@ -86,6 +86,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### API Breaking Changes
 
 * [\#11496](https://github.com/cosmos/cosmos-sdk/pull/11496) refactor abstractions for snapshot and pruning; snapshot intervals eventually pruned; unit tests.
+* (types) [\#11689](https://github.com/cosmos/cosmos-sdk/pull/11689) Make `Coins#Sub` and `Coins#SafeSub` consistent with `Coins#Add`.
 * (store)[\#11152](https://github.com/cosmos/cosmos-sdk/pull/11152) Remove `keep-every` from pruning options.
 * [\#10950](https://github.com/cosmos/cosmos-sdk/pull/10950) Add `envPrefix` parameter to `cmd.Execute`.
 * (x/mint) [\#10441](https://github.com/cosmos/cosmos-sdk/pull/10441) The `NewAppModule` function now accepts an inflation calculation function as an argument.
@@ -176,6 +177,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+* [\#11696](https://github.com/cosmos/cosmos-sdk/pull/11696) Rename `helpers.GenTx` to `GenSignedMockTx` to avoid confusion with genutil's `GenTxCmd`.
 * (x/auth/vesting) [\#11652](https://github.com/cosmos/cosmos-sdk/pull/11652) Add util functions for `Period(s)`
 * [\#11630](https://github.com/cosmos/cosmos-sdk/pull/11630) Add SafeSub method to sdk.Coin.
 * [\#11511](https://github.com/cosmos/cosmos-sdk/pull/11511) Add api server flags to start command.
@@ -209,6 +211,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+* [\#11693](https://github.com/cosmos/cosmos-sdk/pull/11693) Add validation for gentx cmd.
+* [\#11645](https://github.com/cosmos/cosmos-sdk/pull/11645) Fix `--home` flag ignored when running help.
 * [\#11558](https://github.com/cosmos/cosmos-sdk/pull/11558) Fix `--dry-run` not working when using tx command.
 * [\#11354](https://github.com/cosmos/cosmos-sdk/pull/11355) Added missing pagination flag for `bank q total` query.
 * [\#11197](https://github.com/cosmos/cosmos-sdk/pull/11197) Signing with multisig now works with multisig address which is not in the keyring.

Dockerfile

@@ -10,7 +10,7 @@
 # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys add foo
 # > docker run -it -p 26657:26657 -p 26656:26656 -v ~/.simappcli:/root/.simapp simapp simd keys list
 # TODO: demo connecting rest-server (or is this in server now?)
-FROM golang:alpine AS build-env
+FROM golang:1.18-alpine AS build-env
 
 # Install minimum necessary dependencies
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3

client/cmd_test.go

@@ -70,6 +70,7 @@ func TestSetCmdClientContextHandler(t *testing.T) {
 		}
 
 		c.Flags().String(flags.FlagChainID, "", "network chain ID")
+		c.Flags().String(flags.FlagHome, "", "home dir")
 
 		return c
 	}
@@ -91,6 +92,14 @@ func TestSetCmdClientContextHandler(t *testing.T) {
 				fmt.Sprintf("--%s=new-chain-id", flags.FlagChainID),
 			},
 		},
+		{
+			"flags set with space",
+			initClientCtx.WithHomeDir("/tmp/dir"),
+			[]string{
+				fmt.Sprintf("--%s", flags.FlagHome),
+				"/tmp/dir",
+			},
+		},
 	}
 
 	for _, tc := range testCases {

contrib/devtools/Dockerfile

@@ -4,7 +4,7 @@
 
 FROM bufbuild/buf:1.1.0 as BUILDER
 
-FROM golang:alpine
+FROM golang:1.18-alpine
 
 RUN apk add --no-cache \
   nodejs \

contrib/devtools/Makefile

@@ -57,28 +57,20 @@ tools-stamp: statik runsim
 	# in a row.
 	touch $@
 
-# Install the runsim binary with a temporary workaround of entering an outside
-# directory as the "go get" command ignores the -mod option and will polute the
-# go.{mod, sum} files.
-#
-# ref: https://github.com/golang/go/issues/30515
+# Install the runsim binary
 statik: $(STATIK)
 $(STATIK):
 	@echo "Installing statik..."
-	@(cd /tmp && go get github.com/rakyll/statik@v0.1.6)
+	@go install github.com/rakyll/statik@v0.1.6
 
-# Install the runsim binary with a temporary workaround of entering an outside
-# directory as the "go get" command ignores the -mod option and will polute the
-# go.{mod, sum} files.
-#
-# ref: https://github.com/golang/go/issues/30515
+# Install the runsim binary
 runsim: $(RUNSIM)
 $(RUNSIM):
 	@echo "Installing runsim..."
-	@(cd /tmp && go get github.com/cosmos/tools/cmd/runsim@v1.0.0)
+	@go install github.com/cosmos/tools/cmd/runsim@v1.0.0
 
 tools-clean:
 	rm -f $(STATIK) $(GOLANGCI_LINT) $(RUNSIM)
 	rm -f tools-stamp
 
-.PHONY: tools-clean statik runsim
+.PHONY: tools-clean statik runsim

contrib/images/simd-dlv/Dockerfile

@@ -1,4 +1,5 @@
-FROM golang:alpine AS build
+FROM golang:1.18-alpine AS build
+
 RUN apk add build-base git linux-headers libc-dev
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 WORKDIR /work
@@ -20,4 +21,4 @@ WORKDIR /simd
 EXPOSE 26656 26657 2345
 ENTRYPOINT ["/usr/bin/wrapper.sh"]
 CMD ["start", "--log_format", "plain"]
-STOPSIGNAL SIGTERM
+STOPSIGNAL SIGTERM

contrib/images/simd-env/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine AS build
+FROM golang:1.18-alpine AS build
 RUN apk add build-base git linux-headers
 WORKDIR /work
 COPY go.mod go.sum /work/

contrib/rosetta/rosetta-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as build
+FROM golang:1.18-alpine as build
 
 RUN apk add --no-cache tar git
 

contrib/rosetta/rosetta-cli/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:alpine as build
+FROM golang:1.18-alpine as build
 
 RUN apk add git gcc libc-dev --no-cache
 
@@ -15,4 +15,4 @@ RUN apk add gcc libc-dev python3 --no-cache
 
 ENV PATH=$PATH:/bin
 
-COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli
+COPY --from=build /rosetta/rosetta-cli /bin/rosetta-cli

docs/architecture/adr-030-authz-module.md

@@ -6,6 +6,7 @@
 * 2020-10-12: Updated Draft
 * 2020-11-13: Accepted
 * 2020-05-06: proto API updates, use `sdk.Msg` instead of `sdk.ServiceMsg` (the latter concept was removed from Cosmos SDK)
+* 2022-04-20: Updated the `SendAuthorization` proto docs to clarify the `SpendLimit` is a required field. (Generic authorization can be used with bank msg type url to create limit less bank authorization)
 
 ## Status
 
@@ -87,8 +88,8 @@ a `SpendLimit` and updates it down to zero:
 ```go
 type SendAuthorization struct {
 	// SpendLimit specifies the maximum amount of tokens that can be spent
-	// by this authorization and will be updated as tokens are spent. If it is
-	// empty, there is no spend limit and any amount of coins can be spent.
+	// by this authorization and will be updated as tokens are spent. This field is required. (Generic authorization 
+	// can be used with bank msg type url to create limit less bank authorization).
 	SpendLimit sdk.Coins
 }