mapofzones
diff --git a/‎.golangci.yml
+3 b/‎.golangci.yml
+3
diff --git a/‎CHANGELOG.md
+23 b/‎CHANGELOG.md
+23
diff --git a/‎CONTRIBUTING.md
+1-1 b/‎CONTRIBUTING.md
+1-1
diff --git a/‎RELEASE_NOTES.md
+13-16 b/‎RELEASE_NOTES.md
+13-16
diff --git a/‎baseapp/abci.go
+13-1 b/‎baseapp/abci.go
+13-1
diff --git a/‎baseapp/baseapp_test.go
+5-1 b/‎baseapp/baseapp_test.go
+5-1
diff --git a/‎client/docs/statik/init.go
+1-1 b/‎client/docs/statik/init.go
+1-1
@@ -56,6 +56,9 @@ issues:
     - text: "ST1016:"
       linters:
         - stylecheck
+    - text: "SA1019: codec.LegacyAmino is deprecated"
+      linters:
+        - staticcheck
   max-issues-per-linter: 10000
   max-same-issues: 10000
 
 
@@ -34,10 +34,33 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## [v0.42.6](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.6) - 2021-06-18
+
+### Improvements
+
+* [\#9428](https://github.com/cosmos/cosmos-sdk/pull/9428) Optimize bank InitGenesis. Added `k.initBalances`.
+* [\#9429](https://github.com/cosmos/cosmos-sdk/pull/9429) Add `cosmos_sdk_version` to node_info
+* [\#9541](https://github.com/cosmos/cosmos-sdk/pull/9541) Bump tendermint dependency to v0.34.11.
+
+### Bug Fixes
+
+* [\#9385](https://github.com/cosmos/cosmos-sdk/pull/9385) Fix IBC `query ibc client header` cli command. Support historical queries for query header/node-state commands.
+* [\#9401](https://github.com/cosmos/cosmos-sdk/pull/9401) Fixes incorrect export of IBC identifier sequences. Previously, the next identifier sequence for clients/connections/channels was not set during genesis export. This resulted in the next identifiers being generated on the new chain to reuse old identifiers (the sequences began again from 0).
+* [\#9408](https://github.com/cosmos/cosmos-sdk/pull/9408) Update simapp to use correct default broadcast mode.
+* [\#9513](https://github.com/cosmos/cosmos-sdk/pull/9513) Fixes testnet CLI command. Testnet now updates the supply in genesis. Previously, when using add-genesis-account and testnet together, inconsistent genesis files would be produced, as only add-genesis-account was updating the supply.
+* (x/gov) [\#8813](https://github.com/cosmos/cosmos-sdk/pull/8813) fix `GET /cosmos/gov/v1beta1/proposals/{proposal_id}/deposits` to include initial deposit
+
+### Features
+
+* [\#9383](https://github.com/cosmos/cosmos-sdk/pull/9383) New CLI command `query ibc-transfer escrow-address <port> <channel id>` to get the escrow address for a channel; can be used to then query balance of escrowed tokens
+* (baseapp, types) [#\9390](https://github.com/cosmos/cosmos-sdk/pull/9390) Add current block header hash to `Context`
+* (store) [\#9403](https://github.com/cosmos/cosmos-sdk/pull/9403) Add `RefundGas` function to `GasMeter` interface
+
 ## [v0.42.5](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.5) - 2021-05-18
 
 ### Bug Fixes
 
+* [\#9514](https://github.com/cosmos/cosmos-sdk/issues/9514) Fix panic when retrieving the `BlockGasMeter` on `(Re)CheckTx` mode.
 * [\#9235](https://github.com/cosmos/cosmos-sdk/pull/9235) CreateMembershipProof/CreateNonMembershipProof now returns an error
 if input key is empty, or input data contains empty key.
 * [\#9108](https://github.com/cosmos/cosmos-sdk/pull/9108) Fixed the bug with querying multisig account, which is not showing threshold and public_keys.
 
@@ -97,7 +97,7 @@ All PRs require two Reviews before merge (except docs changes, or variable name-
 If you open a PR on the Cosmos SDK, it is mandatory to update the relevant documentation in /docs.
 
 - If your change relates to the core SDK (baseapp, store, ...), please update the `docs/basics/`, `docs/core/` and/or `docs/building-modules/` folders.
-- If your changes relate to the core of the CLI or Light-client (not specifically to module's CLI/Rest), please modify the `docs/interfaces/` folder.
+- If your changes relate to the core of the CLI (not specifically to module's CLI/Rest), please modify the `docs/run-node/` folder.
 - If your changes relate to a module, please update the module's spec in `x/moduleName/docs/spec/`.
 
 ## Forking
 
@@ -1,25 +1,22 @@
-# Cosmos SDK v0.42.5 "Stargate" Release Notes
+# Cosmos SDK v0.42.6 "Stargate" Release Notes
 
 This release includes various minor bugfixes and improvments, including:
 
-- Fix support for building the Cosmos SDK on ARM architectures,
-- Fix the `[appd] keys show/list` CLI subcommands for multisigs,
-- Internal code performance improvment.
+- x/bank's InitGenesis optimization, which should significantly decrease genesis initialization time,
+- bump Tendermint to v0.34.11 to fix state sync issues,
+- add `cosmos_sdk_version` to `node_info` to be able to query the SDK version used by a node,
+- IBC bugfixes and improvements (see below for more info),
+- new fields on `sdk.Context` (see below for more info).
 
-It also introduces one new feature: adding the `[appd] config` subcommand back to the SDK.
+See the [Cosmos SDK v0.42.6 milestone](https://github.com/cosmos/cosmos-sdk/milestone/45?closed=1) on our issue tracker for the exhaustive list of all changes.
 
-See the [Cosmos SDK v0.42.5 milestone](https://github.com/cosmos/cosmos-sdk/milestone/44?closed=1) on our issue tracker for the exhaustive list of all changes.
+### IBC Bugfixes and Improvements
 
-### The `config` Subcommand
+The `[appd] query ibc client header` is fixed and allows querying by height for the header and node-state command. This allows easier venerability of which IBC tokens belong to which chains. IBC's ExportGenesis now exports all fields, including previously missing `NextClientSequence`, `NextConnectionSequence` and `NextChannelSequence`. A new subcommand `[appd] query ibc-transfer escrow-address` has been added to get the escrow address for a channel; it can be used to then query balance of escrowed tokens.
 
-One new feature introduced in the Stargate series was the merging of the two CLI binaries `[appd]` and `[appcli]` into one single application binary. In this process, the `[appcli] config` subcommand, which was used to save client-side configuration into a TOML file, was removed.
+### New Fields on `sdk.Context`
 
-Due to [popular demand](https://github.com/cosmos/cosmos-sdk/issues/8529), we have introduced this feature back to the SDK, under the `[appd] config` subcommand. The functionality is as follows:
+Two fields have been added on `sdk.Context`:
 
-- `[appd] config`: Output all client-side configuration.
-- `[appd] config [config-name]`: Get the given configuration (e.g. `keyring-backend` or `node-id`).
-- `[appd] config [config-name] [config-value]`: Set and persist the given configuration with the new value.
-
-All configurations are persisted to the filesystem, under the path `$APP_HOME/config/client.toml`. For the list of all possible client-side configurations, please have a look at this `client.toml` file, as it is heavily commented.
-
-Environment variables binding to client-side configuration also works. For example, the command `KEYRING_BACKEND=os [appd] tx bank send ...` will bind ENV variable to the `keyring-backend` config. The order or precedence for config is: `flags > env vars > client.toml file`.
+- `ctx.HeaderHash` adds the current block header hash obtained during abci.RequestBeginBlock to the Context,
+- `ctx.GasMeter().RefundGas(<amount>, <description>)` adds support for refunding gas directly to the gas meter.
@@ -173,7 +173,19 @@ func (app *BaseApp) BeginBlock(req abci.RequestBeginBlock) (res abci.ResponseBeg
 		gasMeter = sdk.NewInfiniteGasMeter()
 	}
 
-	app.deliverState.ctx = app.deliverState.ctx.WithBlockGasMeter(gasMeter)
+	// NOTE: header hash is not set in NewContext, so we manually set it here
+
+	app.deliverState.ctx = app.deliverState.ctx.
+		WithBlockGasMeter(gasMeter).
+		WithHeaderHash(req.Hash)
+
+	// we also set block gas meter to checkState in case the application needs to
+	// verify gas consumption during (Re)CheckTx
+	if app.checkState != nil {
+		app.checkState.ctx = app.checkState.ctx.
+			WithBlockGasMeter(gasMeter).
+			WithHeaderHash(req.Hash)
+	}
 
 	if app.beginBlocker != nil {
 		res = app.beginBlocker(app.deliverState.ctx, req)
 
@@ -950,7 +950,11 @@ func TestCheckTx(t *testing.T) {
 
 	// If a block is committed, CheckTx state should be reset.
 	header := tmproto.Header{Height: 1}
-	app.BeginBlock(abci.RequestBeginBlock{Header: header})
+	app.BeginBlock(abci.RequestBeginBlock{Header: header, Hash: []byte("hash")})
+
+	require.NotNil(t, app.checkState.ctx.BlockGasMeter(), "block gas meter should have been set to checkState")
+	require.NotEmpty(t, app.checkState.ctx.HeaderHash())
+
 	app.EndBlock(abci.RequestEndBlock{})
 	app.Commit()
 
 
@@ -1,3 +1,3 @@
 package statik
 
-//This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik
+// This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`package statik`
`2`	`2`
`3`		`-//This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik`
	`3`	`+// This just for fixing the error in importing empty github.com/cosmos/cosmos-sdk/client/docs/statik`