From 26a4abe19ea4d70534fb5113d00c77b901a6b682 Mon Sep 17 00:00:00 2001 From: Lucas Bertrand Date: Wed, 20 Dec 2023 13:20:10 +0100 Subject: [PATCH 1/2] chore: remove build types in `.goreleaser.yaml` (#1442) * remove build types * changelog --- .goreleaser.yaml | 98 +++++------------------------------------------- changelog.md | 2 + 2 files changed, 11 insertions(+), 89 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 090108f3fa..0b3917dead 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -19,7 +19,7 @@ env: - CC_linux_amd64=x86_64-linux-gnu-gcc - CXX_linux_amd64=x86_64-linux-gnu-g++ - CC_windows_amd64=x86_64-w64-mingw32-gcc - - CXX_windows_amd64=x86_64-w64-mingw32-g++ + - CXX_windows_amd64=x86_64-w64-mingw32-g++ - VERSION={{ .Version }} - COMMIT={{ .Commit }} - BUILDTIME={{ .Date }} @@ -32,9 +32,9 @@ before: - go mod tidy builds: - - id: "zetacored_testnet" + - id: "zetacored" main: ./cmd/zetacored - binary: "zetacored_testnet-{{ .Os }}-{{ .Arch }}" + binary: "zetacored-{{ .Os }}-{{ .Arch }}" env: - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' @@ -48,9 +48,8 @@ builds: ignore: - goos: windows goarch: arm64 - flags: &default_testnet_flags - - -tags=TESTNET,pebbledb,ledger,cgo,netgo - - -installsuffix=static + flags: &default_flags + - -tags=pebbledb,ledger ldflags: &default_ldflags - -X github.com/cosmos/cosmos-sdk/version.Name=zetacore - -X github.com/cosmos/cosmos-sdk/version.ServerName=zetacored @@ -61,11 +60,11 @@ builds: - -X github.com/zeta-chain/zetacore/common.Version={{ .Version }} - -X github.com/zeta-chain/zetacore/common.CommitHash={{ .Env.COMMIT }} - -X github.com/zeta-chain/zetacore/common.BuildTime=={{ .Env.BUILDTIME }} - - -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb + - -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb - - id: "zetaclientd_testnet" + - id: "zetaclientd" main: ./cmd/zetaclientd - binary: "zetaclientd_testnet-{{ .Os }}-{{ .Arch }}" + binary: "zetaclientd-{{ .Os }}-{{ .Arch }}" env: - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' @@ -79,88 +78,9 @@ builds: ignore: - goos: windows goarch: arm64 - flags: *default_testnet_flags + flags: *default_flags ldflags: *default_ldflags - - id: "zetacored_mock_mainnet" - main: ./cmd/zetacored - binary: "zetacored_mock_mainnet-{{ .Os }}-{{ .Arch }}" - env: - - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' - goos: - - linux - - darwin - - windows - goarch: - - arm64 - - amd64 - ignore: - - goos: windows - goarch: arm64 - flags: &default_mock_mainnet_flags - - -tags=MOCK_MAINNET,pebbledb,ledger,cgo - ldflags: *default_ldflags - - - id: "zetaclientd_mock_mainnet" - main: ./cmd/zetaclientd - binary: "zetaclientd_mock_mainnet-{{ .Os }}-{{ .Arch }}" - env: - - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' - goos: - - linux - # - darwin - # - windows - goarch: - - arm64 - - amd64 - ignore: - - goos: windows - goarch: arm64 - flags: *default_mock_mainnet_flags - ldflags: *default_ldflags - - - id: "zetacored_mainnet" - main: ./cmd/zetacored - binary: "zetacored_mainnet-{{ .Os }}-{{ .Arch }}" - env: - - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' - goos: - - linux - - darwin - - windows - goarch: - - arm64 - - amd64 - ignore: - - goos: windows - goarch: arm64 - flags: &default_mainnet_flags - - -tags=pebbledb,ledger,cgo - ldflags: *default_ldflags - - - id: "zetaclientd_mainnet" - main: ./cmd/zetaclientd - binary: "zetaclientd_mainnet-{{ .Os }}-{{ .Arch }}" - env: - - 'CC={{ index .Env (print "CC_" .Os "_" .Arch) }}' - - 'CXX={{ index .Env (print "CXX_" .Os "_" .Arch) }}' - goos: - - linux - # - darwin - # - windows - goarch: - - arm64 - - amd64 - ignore: - - goos: windows - goarch: arm64 - flags: *default_mainnet_flags - ldflags: *default_ldflags - - archives: - format: binary name_template: "{{ .Binary }}" diff --git a/changelog.md b/changelog.md index d307a07e74..d83253c00b 100644 --- a/changelog.md +++ b/changelog.md @@ -45,6 +45,8 @@ ### Chores +* [1442](https://github.com/zeta-chain/node/pull/1442) - remove build types in `.goreleaser.yaml` + ### Tests - Add unit tests for adding votes to a ballot ### CI From cdeb3e35d2aa2bb5a32fe2b8395c8f94b51fc469 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Wed, 20 Dec 2023 17:48:22 +0400 Subject: [PATCH 2/2] feat: `snapshots` command (#1411) * feat: add the snapshots command * make generate * make generate * changelog --------- Co-authored-by: Lucas Bertrand --- changelog.md | 1 + cmd/zetacored/root.go | 10 ++++-- docs/cli/zetacored/zetacored.md | 1 + docs/cli/zetacored/zetacored_snapshots.md | 29 +++++++++++++++++ .../zetacored/zetacored_snapshots_delete.md | 27 ++++++++++++++++ .../cli/zetacored/zetacored_snapshots_dump.md | 28 +++++++++++++++++ .../zetacored/zetacored_snapshots_export.md | 28 +++++++++++++++++ .../cli/zetacored/zetacored_snapshots_list.md | 27 ++++++++++++++++ .../cli/zetacored/zetacored_snapshots_load.md | 27 ++++++++++++++++ .../zetacored/zetacored_snapshots_restore.md | 31 +++++++++++++++++++ 10 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 docs/cli/zetacored/zetacored_snapshots.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_delete.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_dump.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_export.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_list.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_load.md create mode 100644 docs/cli/zetacored/zetacored_snapshots_restore.md diff --git a/changelog.md b/changelog.md index d83253c00b..a1706d308e 100644 --- a/changelog.md +++ b/changelog.md @@ -10,6 +10,7 @@ ### Features * [1395](https://github.com/zeta-chain/node/pull/1395) - Add state variable to track aborted zeta amount * [1387](https://github.com/zeta-chain/node/pull/1387) - Add HSM capability for zetaclient hot key +* [1410](https://github.com/zeta-chain/node/pull/1410) - `snapshots` commands * enable zetaclients to use dynamic gas price on zetachain - enables >0 min_gas_price in feemarket module * add static chain data for Sepolia testnet * added metrics to track the burn rate of the hotkey in the telemetry server as well as prometheus diff --git a/cmd/zetacored/root.go b/cmd/zetacored/root.go index 6abf556bc6..9f1835c9bb 100644 --- a/cmd/zetacored/root.go +++ b/cmd/zetacored/root.go @@ -7,6 +7,8 @@ import ( "os" "path/filepath" + "github.com/cosmos/cosmos-sdk/client/snapshot" + appparams "github.com/cosmos/cosmos-sdk/simapp/params" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/evmos/ethermint/crypto/hd" @@ -119,6 +121,10 @@ func initTmConfig() *tmcfg.Config { } func initRootCmd(rootCmd *cobra.Command, encodingConfig appparams.EncodingConfig) { + ac := appCreator{ + encCfg: encodingConfig, + } + rootCmd.AddCommand( ethermintclient.ValidateChainID( genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome), @@ -136,11 +142,9 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig appparams.EncodingConfig debug.Cmd(), config.Cmd(), + snapshot.Cmd(ac.newApp), ) - ac := appCreator{ - encCfg: encodingConfig, - } zevmserver.AddCommands(rootCmd, zevmserver.NewDefaultStartOptions(ac.newApp, app.DefaultNodeHome), ac.appExport, addModuleInitFlags) // the ethermintserver one supercedes the sdk one diff --git a/docs/cli/zetacored/zetacored.md b/docs/cli/zetacored/zetacored.md index 72e3c72a76..4b5f360d55 100644 --- a/docs/cli/zetacored/zetacored.md +++ b/docs/cli/zetacored/zetacored.md @@ -32,6 +32,7 @@ Zetacore Daemon (server) * [zetacored query](zetacored_query.md) - Querying subcommands * [zetacored rollback](zetacored_rollback.md) - rollback cosmos-sdk and tendermint state by one height * [zetacored rosetta](zetacored_rosetta.md) - spin up a rosetta server +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots * [zetacored start](zetacored_start.md) - Run the full node * [zetacored status](zetacored_status.md) - Query remote node for status * [zetacored tendermint](zetacored_tendermint.md) - Tendermint subcommands diff --git a/docs/cli/zetacored/zetacored_snapshots.md b/docs/cli/zetacored/zetacored_snapshots.md new file mode 100644 index 0000000000..e75ca720d8 --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots.md @@ -0,0 +1,29 @@ +# snapshots + +Manage local snapshots + +### Options + +``` + -h, --help help for snapshots +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored](zetacored.md) - Zetacore Daemon (server) +* [zetacored snapshots delete](zetacored_snapshots_delete.md) - Delete a local snapshot +* [zetacored snapshots dump](zetacored_snapshots_dump.md) - Dump the snapshot as portable archive format +* [zetacored snapshots export](zetacored_snapshots_export.md) - Export app state to snapshot store +* [zetacored snapshots list](zetacored_snapshots_list.md) - List local snapshots +* [zetacored snapshots load](zetacored_snapshots_load.md) - Load a snapshot archive file (.tar.gz) into snapshot store +* [zetacored snapshots restore](zetacored_snapshots_restore.md) - Restore app state from local snapshot + diff --git a/docs/cli/zetacored/zetacored_snapshots_delete.md b/docs/cli/zetacored/zetacored_snapshots_delete.md new file mode 100644 index 0000000000..1fdd8cc105 --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_delete.md @@ -0,0 +1,27 @@ +# snapshots delete + +Delete a local snapshot + +``` +zetacored snapshots delete [height] [format] [flags] +``` + +### Options + +``` + -h, --help help for delete +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots + diff --git a/docs/cli/zetacored/zetacored_snapshots_dump.md b/docs/cli/zetacored/zetacored_snapshots_dump.md new file mode 100644 index 0000000000..8cca605a1d --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_dump.md @@ -0,0 +1,28 @@ +# snapshots dump + +Dump the snapshot as portable archive format + +``` +zetacored snapshots dump [height] [format] [flags] +``` + +### Options + +``` + -h, --help help for dump + -o, --output string output file +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots + diff --git a/docs/cli/zetacored/zetacored_snapshots_export.md b/docs/cli/zetacored/zetacored_snapshots_export.md new file mode 100644 index 0000000000..e331f1c90f --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_export.md @@ -0,0 +1,28 @@ +# snapshots export + +Export app state to snapshot store + +``` +zetacored snapshots export [flags] +``` + +### Options + +``` + --height int Height to export, default to latest state height + -h, --help help for export +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots + diff --git a/docs/cli/zetacored/zetacored_snapshots_list.md b/docs/cli/zetacored/zetacored_snapshots_list.md new file mode 100644 index 0000000000..dceabbe0a8 --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_list.md @@ -0,0 +1,27 @@ +# snapshots list + +List local snapshots + +``` +zetacored snapshots list [flags] +``` + +### Options + +``` + -h, --help help for list +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots + diff --git a/docs/cli/zetacored/zetacored_snapshots_load.md b/docs/cli/zetacored/zetacored_snapshots_load.md new file mode 100644 index 0000000000..c1dd66e5c7 --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_load.md @@ -0,0 +1,27 @@ +# snapshots load + +Load a snapshot archive file (.tar.gz) into snapshot store + +``` +zetacored snapshots load [archive-file] [flags] +``` + +### Options + +``` + -h, --help help for load +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots + diff --git a/docs/cli/zetacored/zetacored_snapshots_restore.md b/docs/cli/zetacored/zetacored_snapshots_restore.md new file mode 100644 index 0000000000..03502fe8e6 --- /dev/null +++ b/docs/cli/zetacored/zetacored_snapshots_restore.md @@ -0,0 +1,31 @@ +# snapshots restore + +Restore app state from local snapshot + +### Synopsis + +Restore app state from local snapshot + +``` +zetacored snapshots restore [height] [format] [flags] +``` + +### Options + +``` + -h, --help help for restore +``` + +### Options inherited from parent commands + +``` + --home string directory for config and data + --log_format string The logging format (json|plain) + --log_level string The logging level (trace|debug|info|warn|error|fatal|panic) + --trace print out full stack trace on errors +``` + +### SEE ALSO + +* [zetacored snapshots](zetacored_snapshots.md) - Manage local snapshots +