@agoric/cosmos 0.35.0-u20.0 → 0.35.0-u21.0.1

package/app/upgrade.go

@@ -6,13 +6,28 @@ import (
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
+	"github.com/cosmos/cosmos-sdk/baseapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
+	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
+	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
+	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
+	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
+	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	ibctmmigrations "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint/migrations"
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"agoric-upgrade-20",
+	"agoric-upgrade-21",
+	"agoric-upgrade-21-a3p",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -46,7 +61,8 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("agoric-upgrade-20"):
+	case validUpgradeName("agoric-upgrade-21"),
+		validUpgradeName("agoric-upgrade-21-a3p"):
 		return true
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
@@ -94,17 +110,10 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, args ...vm.
 
 func getVariantFromUpgradeName(upgradeName string) string {
 	switch upgradeName {
-	case "UNRELEASED_A3P_INTEGRATION":
+	case "agoric-upgrade-21-a3p":
 		return "A3P_INTEGRATION"
-	case "UNRELEASED_main":
+	case "agoric-upgrade-21":
 		return "MAINNET"
-	case "UNRELEASED_devnet":
-		return "DEVNET"
-	case "UNRELEASED_emerynet":
-		return "EMERYNET"
-	case "UNRELEASED_BASIC":
-		// Noupgrade for this version.
-		return ""
 	default:
 		return ""
 	}
@@ -129,11 +138,64 @@ func buildProposalStepFromScript(targetUpgrade string, builderScript string) (vm
 	)
 }
 
-// upgrade20Handler performs standard upgrade actions plus custom actions for upgrade-20.
-func upgrade20Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// RegisterUpgradeHandlers registers the upgrade handlers for all upgradeNames.
+func (app *GaiaApp) RegisterUpgradeHandlers() {
+	// Set param key table for params module migration
+	for _, subspace := range app.ParamsKeeper.GetSubspaces() {
+		subspace := subspace
+
+		var keyTable paramstypes.KeyTable
+		switch subspace.Name() {
+		case authtypes.ModuleName:
+			keyTable = authtypes.ParamKeyTable() //nolint:staticcheck
+		case banktypes.ModuleName:
+			keyTable = banktypes.ParamKeyTable() //nolint:staticcheck
+		case stakingtypes.ModuleName:
+			keyTable = stakingtypes.ParamKeyTable() //nolint:staticcheck
+		case minttypes.ModuleName:
+			keyTable = minttypes.ParamKeyTable() //nolint:staticcheck
+		case distrtypes.ModuleName:
+			keyTable = distrtypes.ParamKeyTable() //nolint:staticcheck
+		case slashingtypes.ModuleName:
+			keyTable = slashingtypes.ParamKeyTable() //nolint:staticcheck
+		case govtypes.ModuleName:
+			keyTable = govv1.ParamKeyTable() //nolint:staticcheck
+		case crisistypes.ModuleName:
+			keyTable = crisistypes.ParamKeyTable() //nolint:staticcheck
+		default:
+			continue
+		}
+
+		if !subspace.HasKeyTable() {
+			subspace.WithKeyTable(keyTable)
+		}
+	}
+
+	baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
+
+	for _, name := range upgradeNamesOfThisVersion {
+		app.UpgradeKeeper.SetUpgradeHandler(
+			name,
+			upgrade21Handler(app, name, baseAppLegacySS),
+		)
+	}
+}
+
+// upgrade21Handler performs standard upgrade actions plus custom actions for upgrade-21.
+func upgrade21Handler(app *GaiaApp, targetUpgrade string, baseAppLegacySS paramstypes.Subspace) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+	_ = targetUpgrade
 	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
 		app.CheckControllerInited(false)
 
+		// prune expired tendermint consensus states to save storage space
+		_, err := ibctmmigrations.PruneExpiredConsensusStates(ctx, app.AppCodec(), app.IBCKeeper.ClientKeeper)
+		if err != nil {
+			return nil, err
+		}
+
+		// Migrate Tendermint consensus parameters from x/params module to a dedicated x/consensus module.
+		baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper)
+
 		CoreProposalSteps := []vm.CoreProposalStep{}
 
 		// These CoreProposalSteps are not idempotent and should only be executed
@@ -149,26 +211,65 @@ func upgrade20Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 			// Each CoreProposalStep runs sequentially, and can be constructed from
 			// one or more modules executing in parallel within the step.
 			CoreProposalSteps = append(CoreProposalSteps,
-				// Orchestration vats: Fix memory leak in vow tools
-				// vat-ibc (included in orchestration): Accommodate string sequence numbers.
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/upgrade-orchestration.js",
-				),
 				// Register a new ZCF to be used for all future contract instances and upgrades
 				vm.CoreProposalStepForModules(
 					"@agoric/builders/scripts/vats/upgrade-zcf.js",
 				),
+				vm.CoreProposalStepForModules(
+					"@agoric/builders/scripts/vats/upgrade-provisionPool-to-BLD.js",
+				),
 				// because of #10794, we need to do at least a null upgrade of
 				// the walletFactory on every software upgrade
 				vm.CoreProposalStepForModules(
 					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
 				),
-				// vat-bank is slowly leaking, possibly because of the liveslots resolved promise leak
-				// (https://github.com/Agoric/agoric-sdk/issues/11118). Restart to pick up the fix.
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/upgrade-bank.js",
-				),
 			)
+
+			// Reserve contract needs to be upgraded for IST wind-down.
+			reserveUpgradeStep, err := buildProposalStepWithArgs(
+				"@agoric/builders/scripts/vats/upgrade-vats.js",
+				"upgradeZoeContractsProposalBuilder",
+				[]struct {
+					KitLookup  []string `json:"kitLookup"`
+					BundleName string   `json:"bundleName"`
+					Entrypoint string   `json:"entrypoint"`
+				}{
+					{
+						KitLookup:  []string{"reserveKit"},
+						BundleName: "reserve",
+						Entrypoint: "@agoric/inter-protocol/src/reserve/assetReserve.js",
+					},
+				},
+			)
+			if err != nil {
+				return module.VersionMap{}, err
+			}
+			CoreProposalSteps = append(CoreProposalSteps,
+				reserveUpgradeStep,
+			)
+
+			// terminationTargets is a slice of "$boardID:$instanceKitLabel" strings.
+			var terminationTargets []string
+			switch getVariantFromUpgradeName(targetUpgrade) {
+			case "MAINNET":
+				// v111 "zcf-b1-4522b-stkATOM-USD_price_feed"
+				terminationTargets = []string{"board052184:stkATOM-USD_price_feed"}
+			case "A3P_INTEGRATION":
+				terminationTargets = []string{"board04091:stATOM-USD_price_feed"}
+			}
+			if len(terminationTargets) > 0 {
+				args := []vm.Jsonable{terminationTargets}
+				terminationStep, err := buildProposalStepWithArgs(
+					"@agoric/vats/src/proposals/terminate-governed-instance.js",
+					// defaultProposalBuilder(powers, targets)
+					"defaultProposalBuilder",
+					args...,
+				)
+				if err != nil {
+					return module.VersionMap{}, err
+				}
+				CoreProposalSteps = append(CoreProposalSteps, terminationStep)
+			}
 		}
 
 		app.upgradeDetails = &upgradeDetails{
@@ -181,7 +282,7 @@ func upgrade20Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 		}
 
 		// Always run module migrations
-		mvm, err := app.mm.RunMigrations(ctx, app.configurator, fromVm)
+		mvm, err := app.ModuleManager.RunMigrations(ctx, app.configurator, fromVm)
 		if err != nil {
 			return mvm, err
 		}

package/app/upgrade_test.go

@@ -17,7 +17,7 @@ func TestBuildProposalSteps(t *testing.T) {
 			"buildProposalStepFromScript",
 			func() (vm.CoreProposalStep, error) {
 				return buildProposalStepFromScript(
-					"UNRELEASED_A3P_INTEGRATION",
+					"agoric-upgrade-21-a3p",
 					"@agoric/builders/scripts/vats/upgrade-orchestration.js",
 				)
 			},

package/cmd/agd/agvm.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/tendermint/tendermint/libs/log"
+	"github.com/cometbft/cometbft/libs/log"
 )
 
 // NewVMCommand creates a new OS command to run the Agoric VM.  It sets up the

package/cmd/agd/main.go

@@ -10,8 +10,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/cometbft/cometbft/libs/log"
 	"github.com/spf13/cast"
-	"github.com/tendermint/tendermint/libs/log"
 
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"

package/cmd/libdaemon/main.go

@@ -15,8 +15,9 @@ import (
 	"net/rpc"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 
-	log "github.com/tendermint/tendermint/libs/log"
+	log "github.com/cometbft/cometbft/libs/log"
 
 	gaia "github.com/Agoric/agoric-sdk/golang/cosmos/app"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/daemon"
@@ -25,6 +26,11 @@ import (
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 )
 
+// Taken from sysexits.h
+const (
+	EX_SOFTWARE = 70 /* internal software error */
+)
+
 type goReturn = struct {
 	str string
 	err error
@@ -32,6 +38,8 @@ type goReturn = struct {
 
 const SwingSetPort = 123
 
+var logger = log.NewTMLogger(log.NewSyncWriter(os.Stderr)).With("module", "cmd/libdaemon")
+
 var vmClientCodec *vm.ClientCodec
 var agdServer *vm.AgdServer
 
@@ -59,8 +67,29 @@ func ConnectVMClientCodec(ctx context.Context, nodePort int, sendFunc func(int,
 	return vmClientCodec, sendToNode
 }
 
+// handlePanic is a helper function to recover from panics, log them, and exit the process.
+func handlePanic(caller string) {
+	if r := recover(); r != nil {
+		defer func() {
+			if err := recover(); err != nil {
+				// If we panic again, we will exit the process without logging the error or stack.
+				os.Stderr.WriteString("Double panic in exported Go function: " + caller + "\n")
+				os.Exit(EX_SOFTWARE)
+			}
+		}()
+
+		// Log the panic with the caller information.
+		logger.Error("Panic in exported Go function", "caller", caller, "error", r, "stack", debug.Stack())
+
+		// Exit the process with a non-zero exit code.
+		os.Exit(EX_SOFTWARE)
+	}
+}
+
 //export RunAgCosmosDaemon
 func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char) C.int {
+	defer handlePanic("RunAgCosmosDaemon")
+
 	userHomeDir, err := os.UserHomeDir()
 	if err != nil {
 		panic(err)
@@ -92,6 +121,8 @@ func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char)
 	// fmt.Fprintln(os.Stderr, "Starting Cosmos", args)
 	os.Args = args
 	go func() {
+		defer handlePanic("daemon.RunWithController")
+
 		// We run in the background, but exit when the job is over.
 		// swingset.SendToNode("hello from Initial Go!")
 		exitCode := 0
@@ -112,6 +143,7 @@ func RunAgCosmosDaemon(nodePort C.int, toNode C.sendFunc, cosmosArgs []*C.char)
 
 //export ReplyToGo
 func ReplyToGo(replyPort C.int, isError C.int, resp C.Body) C.int {
+	defer handlePanic("ReplyToGo")
 	respStr := C.GoString(resp)
 	// fmt.Printf("Reply to Go %d %s\n", replyPort, respStr)
 	if err := vmClientCodec.Receive(int(replyPort), int(isError) != 0, respStr); err != nil {
@@ -126,6 +158,7 @@ type errorWrapper struct {
 
 //export SendToGo
 func SendToGo(port C.int, msg C.Body) C.Body {
+	defer handlePanic("SendToGo")
 	msgStr := C.GoString(msg)
 	// fmt.Fprintln(os.Stderr, "Send to Go", msgStr)
 	var respStr string