From 9a3d54bac54a92babe6fa1610c2a8c88f85a1e6a Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Wed, 26 Aug 2020 13:27:57 -0600 Subject: [PATCH] fix: force `--pruning=nothing` until we upgrade to Stargate --- packages/agoric-cli/lib/start.js | 2 +- packages/cosmic-swingset/lib/daemon/main.go | 6 +++++- packages/deployment/main.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/agoric-cli/lib/start.js b/packages/agoric-cli/lib/start.js index 7eb9374439e..8d8e1f23ab7 100644 --- a/packages/agoric-cli/lib/start.js +++ b/packages/agoric-cli/lib/start.js @@ -334,7 +334,7 @@ export default async function startMain(progname, rawArgs, powers, opts) { ]); return chainSpawn( - [...debugOpts, 'start', '--pruning=nothing'], + [...debugOpts, 'start'], { env: { ...pspawnEnv, ROLE: 'two_chain' }, }, diff --git a/packages/cosmic-swingset/lib/daemon/main.go b/packages/cosmic-swingset/lib/daemon/main.go index 811248f87db..ef9668575e6 100644 --- a/packages/cosmic-swingset/lib/daemon/main.go +++ b/packages/cosmic-swingset/lib/daemon/main.go @@ -108,7 +108,11 @@ func makeNewApp(sendToController Sender) func(logger log.Logger, db dbm.DB, trac return app.NewAgoricApp( sendToController, logger, db, traceStore, true, invCheckPeriod, skipUpgradeHeights, viper.GetString(flags.FlagHome), - baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))), + // FIGME: instead use: + // baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))), + // but for now, the default cosmos-sdk pruning doesn't keep the last + // N committed blocks on disk, so we only rarely can recover from restarts. + baseapp.SetPruning(store.PruneNothing), baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)), baseapp.SetHaltHeight(viper.GetUint64(server.FlagHaltHeight)), baseapp.SetHaltTime(viper.GetUint64(server.FlagHaltTime)), diff --git a/packages/deployment/main.js b/packages/deployment/main.js index b229861a4e0..fcb7d9a37b4 100644 --- a/packages/deployment/main.js +++ b/packages/deployment/main.js @@ -436,7 +436,7 @@ show-config display the client connection parameters 'play', 'install', `-eexecline=${shellEscape( - '/usr/src/cosmic-swingset/bin/ag-chain-cosmos start --pruning=nothing', + '/usr/src/cosmic-swingset/bin/ag-chain-cosmos start', )}`, ]), );