Bumps [github.com/tendermint/tendermint](https://github.com/tendermint/tendermint) from 0.35.2 to 0.35.3. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/tendermint/tendermint/releases">github.com/tendermint/tendermint's releases</a>.</em></p> <blockquote> <h2>0.35.3 (WARNING: BETA SOFTWARE)</h2> <p><a href="https://github.com/tendermint/tendermint/blob/v0.35.3/CHANGELOG.md#v0.35.3">https://github.com/tendermint/tendermint/blob/v0.35.3/CHANGELOG.md#v0.35.3</a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md">github.com/tendermint/tendermint's changelog</a>.</em></p> <blockquote> <h2>v0.35.3</h2> <p>April 8, 2022</p> <h3>FEATURES</h3> <ul> <li>[cli] <a href="https://github-redirect.dependabot.com/tendermint/tendermint/pull/8081">#8081</a> add a safer-to-use <code>reset-state</code> command. (<a href="https://github.com/marbar3778"><code>@marbar3778</code></a>)</li> </ul> <h3>IMPROVEMENTS</h3> <ul> <li>[consensus] <a href="https://github-redirect.dependabot.com/tendermint/tendermint/pull/8138">#8138</a> change lock handling in reactor and handleMsg for RoundState. (<a href="https://github.com/williambanfield"><code>@williambanfield</code></a>)</li> </ul> <h3>BUG FIXES</h3> <ul> <li>[cli] <a href="https://github-redirect.dependabot.com/tendermint/tendermint/pull/8276">#8276</a> scmigrate: ensure target key is correctly renamed. (<a href="https://github.com/creachadair"><code>@creachadair</code></a>)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="dfa001f5c7"><code>dfa001f</code></a> Prepare changelog for release v0.35.3. (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8289">#8289</a>)</li> <li><a href="5f7031432d"><code>5f70314</code></a> build(deps): Bump github.com/lib/pq from 1.10.4 to 1.10.5 (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8282">#8282</a>)</li> <li><a href="fb7ce48c15"><code>fb7ce48</code></a> scmigrate: ensure target key is correctly renamed (backport <a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8276">#8276</a>) (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8280">#8280</a>)</li> <li><a href="308d283241"><code>308d283</code></a> cli: fix reset command for v0.35 (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8259">#8259</a>)</li> <li><a href="530e81dea4"><code>530e81d</code></a> Fix broken links in the changelog. (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8268">#8268</a>)</li> <li><a href="5051a1ce82"><code>5051a1c</code></a> build(deps): Bump github.com/BurntSushi/toml from 1.0.0 to 1.1.0 (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8253">#8253</a>)</li> <li><a href="ac881db09a"><code>ac881db</code></a> build(deps): Bump github.com/vektra/mockery/v2 from 2.10.2 to 2.10.4 (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8254">#8254</a>)</li> <li><a href="14461339f4"><code>1446133</code></a> Update golangci-lint-action and golang-ci versions. (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8256">#8256</a>)</li> <li><a href="21da336656"><code>21da336</code></a> build(deps): Bump github.com/vektra/mockery/v2 from 2.10.1 to 2.10.2 (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8247">#8247</a>)</li> <li><a href="524d3ceb88"><code>524d3ce</code></a> e2e: Fix hashing for app + Fix logic of TestApp_Hash (backport <a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8229">#8229</a>) (<a href="https://github-redirect.dependabot.com/tendermint/tendermint/issues/8236">#8236</a>)</li> <li>Additional commits viewable in <a href="https://github.com/tendermint/tendermint/compare/v0.35.2...v0.35.3">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details>
126 lines
3.0 KiB
Go
126 lines
3.0 KiB
Go
package server
|
|
|
|
// DONTCOVER
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/spf13/cobra"
|
|
pvm "github.com/tendermint/tendermint/privval"
|
|
tversion "github.com/tendermint/tendermint/version"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
"github.com/cosmos/cosmos-sdk/client"
|
|
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
|
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
|
)
|
|
|
|
// ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
|
|
func ShowNodeIDCmd() *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "show-node-id",
|
|
Short: "Show this node's ID",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
serverCtx := GetServerContextFromCmd(cmd)
|
|
cfg := serverCtx.Config
|
|
|
|
nodeKey, err := cfg.LoadNodeKeyID()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Println(nodeKey)
|
|
return nil
|
|
},
|
|
}
|
|
}
|
|
|
|
// ShowValidatorCmd - ported from Tendermint, show this node's validator info
|
|
func ShowValidatorCmd() *cobra.Command {
|
|
cmd := cobra.Command{
|
|
Use: "show-validator",
|
|
Short: "Show this node's tendermint validator info",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
serverCtx := GetServerContextFromCmd(cmd)
|
|
cfg := serverCtx.Config
|
|
|
|
privValidator, err := pvm.LoadFilePV(cfg.PrivValidator.KeyFile(), cfg.PrivValidator.StateFile())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
pk, err := privValidator.GetPubKey(cmd.Context())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
sdkPK, err := cryptocodec.FromTmPubKeyInterface(pk)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
clientCtx := client.GetClientContextFromCmd(cmd)
|
|
bz, err := clientCtx.Codec.MarshalInterfaceJSON(sdkPK)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Println(string(bz))
|
|
return nil
|
|
},
|
|
}
|
|
|
|
return &cmd
|
|
}
|
|
|
|
// ShowAddressCmd - show this node's validator address
|
|
func ShowAddressCmd() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "show-address",
|
|
Short: "Shows this node's tendermint validator consensus address",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
serverCtx := GetServerContextFromCmd(cmd)
|
|
cfg := serverCtx.Config
|
|
|
|
privValidator, err := pvm.LoadFilePV(cfg.PrivValidator.KeyFile(), cfg.PrivValidator.StateFile())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
valConsAddr := (sdk.ConsAddress)(privValidator.GetAddress())
|
|
fmt.Println(valConsAddr.String())
|
|
return nil
|
|
},
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
// VersionCmd prints tendermint and ABCI version numbers.
|
|
func VersionCmd() *cobra.Command {
|
|
return &cobra.Command{
|
|
Use: "version",
|
|
Short: "Print tendermint libraries' version",
|
|
Long: "Print protocols' and libraries' version numbers against which this app has been compiled.",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
bs, err := yaml.Marshal(&struct {
|
|
Tendermint string
|
|
ABCI string
|
|
BlockProtocol uint64
|
|
P2PProtocol uint64
|
|
}{
|
|
Tendermint: tversion.TMVersion,
|
|
ABCI: tversion.ABCIVersion,
|
|
BlockProtocol: tversion.BlockProtocol,
|
|
P2PProtocol: tversion.P2PProtocol,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Println(string(bs))
|
|
return nil
|
|
},
|
|
}
|
|
}
|