@agoric/cosmos 0.35.0-u18.4 → 0.35.0-u18a.0

package/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.0-u18a.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.5...@agoric/cosmos@0.35.0-u18a.0) (2025-02-07)
+
+
+### Features
+
+* **cosmos:** Next upgrade is agoric-upgrade-18a ([b87159a](https://github.com/Agoric/agoric-sdk/commit/b87159ad77c3c13ae0c2123cb1373d59463f68ef))
+
+
+### Bug Fixes
+
+* **vtransfer:** some tweaks for ack handling ([a6d295a](https://github.com/Agoric/agoric-sdk/commit/a6d295a730126580262f96c383a4c69412a2e54e))
+
+
+
+## [0.35.0-u18.5](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.4...@agoric/cosmos@0.35.0-u18.5) (2024-12-24)
+
+
+### Features
+
+* **cosmos:** Support arbitrary core eval builder arguments ([#10767](https://github.com/Agoric/agoric-sdk/issues/10767)) ([a944f4c](https://github.com/Agoric/agoric-sdk/commit/a944f4cdf36012e8c07fe0804de5e9f3532db3ce)), closes [#10752](https://github.com/Agoric/agoric-sdk/issues/10752) [#10752](https://github.com/Agoric/agoric-sdk/issues/10752)
+* **cosmos:** use `x/vbank` ConsensusVersion to upgrade monitoring ([0e367d3](https://github.com/Agoric/agoric-sdk/commit/0e367d3e9870622acc8a38afe57c2b6cbe629341))
+* migrate upgrade of v7-board from  upgrade 19 to upgrade 18 ([#10761](https://github.com/Agoric/agoric-sdk/issues/10761)) ([837776e](https://github.com/Agoric/agoric-sdk/commit/837776e6eb693603bce4ed3f9af5c659c9a19d2d)), closes [#10760](https://github.com/Agoric/agoric-sdk/issues/10760)
+* upgrade v7-board and test it ([#10516](https://github.com/Agoric/agoric-sdk/issues/10516)) ([d8a109e](https://github.com/Agoric/agoric-sdk/commit/d8a109edcc78c977ef856131b52dd449e6a9d724)), closes [#10394](https://github.com/Agoric/agoric-sdk/issues/10394)
+* **vbank:** new param `allowed_monitoring_accounts` ([5ac4c52](https://github.com/Agoric/agoric-sdk/commit/5ac4c527b5a3e85bb14ba91a32bcbb6beb0097c9))
+* **vtransfer:** extract base address from parameterized address ([3d44b53](https://github.com/Agoric/agoric-sdk/commit/3d44b5363324baa803a2d9523ce11ded7cce1ed1))
+* **vtransfer:** port some `address-hooks.js` functions to Go ([159098b](https://github.com/Agoric/agoric-sdk/commit/159098bbfaddf4448da4778aa29fbc072aed80a9))
+* **x/swingset:** Add parameters for controlling vat cleanup budget ([02c8138](https://github.com/Agoric/agoric-sdk/commit/02c8138bb2090bc995bfe517bc52952014458984)), closes [#8928](https://github.com/Agoric/agoric-sdk/issues/8928)
+* **x/swingset:** Define default vat cleanup budget as { default: 5, kv: 50 } ([d86ee6d](https://github.com/Agoric/agoric-sdk/commit/d86ee6d5cf0882a53ac3a6e3b802e4002c4c1d12))
+* **x/swingset:** Read beansPerUnit in each message handler and pass down to helpers ([55b9b49](https://github.com/Agoric/agoric-sdk/commit/55b9b49d5f77be9db33ae132a8f7b7017a90d0a9))
+* **x/swingset:** Require a non-empty vat cleanup budget to include `default` ([28c4d8b](https://github.com/Agoric/agoric-sdk/commit/28c4d8bf9897f1ff744e64ea0e681ee41064aafd))
+
+
+### Bug Fixes
+
+* **agd:** upgrade all orchestration vats to new liveslots ([59fa82c](https://github.com/Agoric/agoric-sdk/commit/59fa82c4740e1ddace28e1389e3c7c875bcdf93e))
+* **cosmos:** return an error if version is unsupported ([d17e55b](https://github.com/Agoric/agoric-sdk/commit/d17e55b5d5c0a178e49ed9a0402ed52827074426))
+* **x/swingset:** Let migration see incomplete Params structs ([315cdd5](https://github.com/Agoric/agoric-sdk/commit/315cdd56e0955ba26d624ca3a4997888abc1d635))
+
+
+
 ## [0.35.0-u18.4](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.3...@agoric/cosmos@0.35.0-u18.4) (2024-12-17)
 
 **Note:** Version bump only for package @agoric/cosmos

package/ante/inbound_test.go

@@ -215,7 +215,7 @@ func (msk mockSwingsetKeeper) GetBeansPerUnit(ctx sdk.Context) map[string]sdkmat
 	return nil
 }
 
-func (msk mockSwingsetKeeper) ChargeBeans(ctx sdk.Context, addr sdk.AccAddress, beans sdkmath.Uint) error {
+func (msk mockSwingsetKeeper) ChargeBeans(ctx sdk.Context, beansPerUnit map[string]sdkmath.Uint, addr sdk.AccAddress, beans sdkmath.Uint) error {
 	return fmt.Errorf("not implemented")
 }
 
@@ -223,6 +223,6 @@ func (msk mockSwingsetKeeper) GetSmartWalletState(ctx sdk.Context, addr sdk.AccA
 	panic(fmt.Errorf("not implemented"))
 }
 
-func (msk mockSwingsetKeeper) ChargeForSmartWallet(ctx sdk.Context, addr sdk.AccAddress) error {
+func (msk mockSwingsetKeeper) ChargeForSmartWallet(ctx sdk.Context, beansPerUnit map[string]sdkmath.Uint, addr sdk.AccAddress) error {
 	return fmt.Errorf("not implemented")
 }

package/app/app.go

@@ -137,13 +137,22 @@ import (
 
 const appName = "agoric"
 
-// FlagSwingStoreExportDir defines the config flag used to specify where a
-// genesis swing-store export is expected. For start from genesis, the default
-// value is config/swing-store in the home directory. For genesis export, the
-// value is always a "swing-store" directory sibling to the exported
-// genesis.json file.
-// TODO: document this flag in config, likely alongside the genesis path
-const FlagSwingStoreExportDir = "swing-store-export-dir"
+const (
+	// FlagSwingStoreExportDir defines the config flag used to specify where a
+	// genesis swing-store export is expected. For start from genesis, the default
+	// value is config/swing-store in the home directory. For genesis export, the
+	// value is always a "swing-store" directory sibling to the exported
+	// genesis.json file.
+	// TODO: document this flag in config, likely alongside the genesis path
+	FlagSwingStoreExportDir = "swing-store-export-dir"
+	// FlagSwingStoreExportMode defines the export mode for the swing store
+	// Alongside the default mode `operational`, there are two other modes
+	//
+	// 1- `skip` mode will skip the swing store export altogether
+	//
+	// 2- `debug` mode will export all the available store
+	FlagSwingStoreExportMode = "swing-store-export-mode"
+)
 
 var (
 	// DefaultNodeHome default home directories for the application daemon
@@ -673,6 +682,7 @@ func NewAgoricApp(
 	app.EvidenceKeeper = *evidenceKeeper
 
 	swingStoreExportDir := cast.ToString(appOpts.Get(FlagSwingStoreExportDir))
+	swingStoreExportMode := cast.ToString(appOpts.Get(FlagSwingStoreExportMode))
 
 	// NOTE: Any module instantiated in the module manager that is later modified
 	// must be passed by reference here.
@@ -702,7 +712,14 @@ func NewAgoricApp(
 		icaModule,
 		packetforward.NewAppModule(app.PacketForwardKeeper),
 		vstorage.NewAppModule(app.VstorageKeeper),
-		swingset.NewAppModule(app.SwingSetKeeper, &app.SwingStoreExportsHandler, setBootstrapNeeded, app.ensureControllerInited, swingStoreExportDir),
+		swingset.NewAppModule(
+			app.SwingSetKeeper,
+			&app.SwingStoreExportsHandler,
+			setBootstrapNeeded,
+			app.ensureControllerInited,
+			swingStoreExportDir,
+			swingStoreExportMode,
+		),
 		vibcModule,
 		vbankModule,
 		vtransferModule,
@@ -877,7 +894,7 @@ func NewAgoricApp(
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			upgrade18Handler(app, name),
+			upgrade18aHandler(app, name),
 		)
 	}
 

package/app/upgrade.go

@@ -1,10 +1,7 @@
 package gaia
 
 import (
-	"encoding/json"
 	"fmt"
-	"strings"
-	"text/template"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
@@ -14,13 +11,7 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"agoric-upgrade-18-mainnet",
-	"agoric-upgrade-18-devnet",
-	"agoric-upgrade-18-emerynet",
-	"agoric-upgrade-18-basic",
-	"agoric-upgrade-18-basic-2",
-	"agoric-upgrade-18-emerynet-rc3",
-	"agoric-upgrade-18-a3p",
+	"agoric-upgrade-18a",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -54,15 +45,8 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("agoric-upgrade-18-mainnet"),
-		validUpgradeName("agoric-upgrade-18-devnet"),
-		validUpgradeName("agoric-upgrade-18-emerynet"),
-		validUpgradeName("agoric-upgrade-18-basic"),
-		validUpgradeName("agoric-upgrade-18-a3p"):
+	case validUpgradeName("agoric-upgrade-18a"):
 		return true
-	case validUpgradeName("agoric-upgrade-18-basic-2"),
-		validUpgradeName("agoric-upgrade-18-emerynet-rc3"):
-		return false
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
 	}
@@ -79,87 +63,24 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	return true
 }
 
-func buildProposalStepWithArgs(moduleName string, entrypoint string, opts map[string]any) (vm.CoreProposalStep, error) {
-	t := template.Must(template.New("").Parse(`{
-		"module": "{{.moduleName}}",
-		"entrypoint": "{{.entrypoint}}",
-		"args": [ {{.optsArg}} ]
-	}`))
-
-	optsArg, err := json.Marshal(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	var result strings.Builder
-	err = t.Execute(&result, map[string]any{
-		"moduleName": moduleName,
-		"entrypoint": entrypoint,
-		"optsArg":    string(optsArg),
-	})
-	if err != nil {
-		return nil, err
-	}
-	jsonStr := result.String()
-	jsonBz := []byte(jsonStr)
-	if !json.Valid(jsonBz) {
-		return nil, fmt.Errorf("invalid JSON: %s", jsonStr)
-	}
-	proposal := vm.ArbitraryCoreProposal{Json: jsonBz}
-	return vm.CoreProposalStepForModules(proposal), nil
-}
-
-func getVariantFromUpgradeName(upgradeName string) string {
-	switch upgradeName {
-	case "agoric-upgrade-18-mainnet":
-		return "MAINNET"
-	case "agoric-upgrade-18-devnet":
-		return "DEVNET"
-	case "agoric-upgrade-18-emerynet":
-		return "EMERYNET"
-	case "agoric-upgrade-18-basic":
-		return ""
-	case "agoric-upgrade-18-a3p":
-		return "A3P_INTEGRATION"
-	default:
-		return ""
-	}
-}
-
-func replaceElectorateCoreProposalStep(upgradeName string) (vm.CoreProposalStep, error) {
-	variant := getVariantFromUpgradeName(upgradeName)
-
-	if variant == "" {
-		return nil, nil
-	}
-
-	return buildProposalStepWithArgs(
-		"@agoric/builders/scripts/inter-protocol/replace-electorate-core.js",
-		"defaultProposalBuilder",
-		map[string]any{
-			"variant": variant,
-		},
-	)
-}
+// func upgradeMintHolderCoreProposal(upgradeName string) (vm.CoreProposalStep, error) {
+// 	variant := getVariantFromUpgradeName(upgradeName)
 
-func replacePriceFeedsCoreProposal(upgradeName string) (vm.CoreProposalStep, error) {
-	variant := getVariantFromUpgradeName(upgradeName)
+// 	if variant == "" {
+// 		return nil, nil
+// 	}
 
-	if variant == "" {
-		return nil, nil
-	}
+// 	return buildProposalStepWithArgs(
+// 		"@agoric/builders/scripts/vats/upgrade-mintHolder.js",
+// 		"defaultProposalBuilder",
+// 		map[string]any{
+// 			"variant": variant,
+// 		},
+// 	)
+// }
 
-	return buildProposalStepWithArgs(
-		"@agoric/builders/scripts/inter-protocol/updatePriceFeeds.js",
-		"defaultProposalBuilder",
-		map[string]any{
-			"variant": variant,
-		},
-	)
-}
-
-// upgrade18Handler performs standard upgrade actions plus custom actions for upgrade-18.
-func upgrade18Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// upgrade18aHandler performs standard upgrade actions plus custom actions for upgrade-18a.
+func upgrade18aHandler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
 		app.CheckControllerInited(false)
 
@@ -175,45 +96,37 @@ func upgrade18Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 				return module.VersionMap{}, fmt.Errorf("cannot run %s as first upgrade", plan.Name)
 			}
 
-			replaceElectorateStep, err := replaceElectorateCoreProposalStep(targetUpgrade)
-			if err != nil {
-				return nil, err
-			} else if replaceElectorateStep != nil {
-				CoreProposalSteps = append(CoreProposalSteps, replaceElectorateStep)
-			}
-
-			priceFeedUpdate, err := replacePriceFeedsCoreProposal(targetUpgrade)
-			if err != nil {
-				return nil, err
-			} else if priceFeedUpdate != nil {
-				CoreProposalSteps = append(CoreProposalSteps,
-					priceFeedUpdate,
-					// The following have a dependency onto the price feed proposal
-					vm.CoreProposalStepForModules(
-						"@agoric/builders/scripts/vats/add-auction.js",
-					),
-					vm.CoreProposalStepForModules(
-						"@agoric/builders/scripts/vats/upgradeVaults.js",
-					),
-				)
-			}
+			// CoreProposals for Upgrade 19. These should not be introduced
+			// before upgrade 18 is done because they would be run in n:upgrade-next
+			//
+			// upgradeMintHolderStep, err := upgradeMintHolderCoreProposal(targetUpgrade)
+			// if err != nil {
+			// 	return nil, err
+			// } else if upgradeMintHolderStep != nil {
+			// 	CoreProposalSteps = append(CoreProposalSteps, upgradeMintHolderStep)
+			// }
+			//
+			// CoreProposalSteps = append(CoreProposalSteps,
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/inter-protocol/replace-feeDistributor.js",
+			// 	),
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/vats/upgrade-paRegistry.js",
+			// 	),
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/vats/upgrade-provisionPool.js",
+			// 	),
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/vats/upgrade-bank.js",
+			// 	),
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/vats/upgrade-agoricNames.js",
+			// 	),
+			// 	vm.CoreProposalStepForModules(
+			// 		"@agoric/builders/scripts/vats/upgrade-asset-reserve.js",
+			// 	),
+			// )
 
-			// Each CoreProposalStep runs sequentially, and can be constructed from
-			// one or more modules executing in parallel within the step.
-			CoreProposalSteps = append(CoreProposalSteps,
-				vm.CoreProposalStepForModules(
-					// Upgrade Zoe (no new ZCF needed).
-					"@agoric/builders/scripts/vats/upgrade-zoe.js",
-				),
-				// Revive KREAd characters
-				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/revive-kread.js",
-				),
-				vm.CoreProposalStepForModules(
-					// Upgrade to include a cleanup from https://github.com/Agoric/agoric-sdk/pull/10319
-					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
-				),
-			)
 		}
 
 		app.upgradeDetails = &upgradeDetails{

package/daemon/cmd/root.go

@@ -386,6 +386,12 @@ const (
 	ExportedSwingStoreDirectoryName = "swing-store"
 )
 
+var allowedSwingSetExportModes = map[string]bool{
+	swingset.SwingStoreExportModeDebug:       true,
+	swingset.SwingStoreExportModeOperational: true,
+	swingset.SwingStoreExportModeSkip:        true,
+}
+
 // extendCosmosExportCommand monkey-patches the "export" command added by
 // cosmos-sdk to add a required "export-dir" command-line flag, and create the
 // genesis export in the specified directory if the VM is running.
@@ -396,31 +402,52 @@ func extendCosmosExportCommand(cmd *cobra.Command) {
 		panic(err)
 	}
 
+	var keys []string
+	for key := range allowedSwingSetExportModes {
+		keys = append(keys, key)
+	}
+
+	cmd.Flags().String(
+		gaia.FlagSwingStoreExportMode,
+		swingset.SwingStoreExportModeOperational,
+		fmt.Sprintf(
+			"The mode for swingstore export (%s)",
+			strings.Join(keys, " | "),
+		),
+	)
+
 	originalRunE := cmd.RunE
 
 	extendedRunE := func(cmd *cobra.Command, args []string) error {
 		serverCtx := server.GetServerContextFromCmd(cmd)
 
 		exportDir, _ := cmd.Flags().GetString(FlagExportDir)
+		swingStoreExportMode, _ := cmd.Flags().GetString(gaia.FlagSwingStoreExportMode)
+
 		err := os.MkdirAll(exportDir, os.ModePerm)
 		if err != nil {
 			return err
 		}
 
 		genesisPath := filepath.Join(exportDir, ExportedGenesisFileName)
-		swingStoreExportPath := filepath.Join(exportDir, ExportedSwingStoreDirectoryName)
 
-		err = os.MkdirAll(swingStoreExportPath, os.ModePerm)
-		if err != nil {
-			return err
+		// Since none mode doesn't perform any swing store export
+		// There is no point in creating the export directory
+		if swingStoreExportMode != swingset.SwingStoreExportModeSkip {
+			swingStoreExportPath := filepath.Join(exportDir, ExportedSwingStoreDirectoryName)
+
+			err = os.MkdirAll(swingStoreExportPath, os.ModePerm)
+			if err != nil {
+				return err
+			}
+			// We unconditionally set FlagSwingStoreExportDir as for export, it makes
+			// little sense for users to control this location separately, and we don't
+			// want to override any swing-store artifacts that may be associated to the
+			// current genesis.
+			serverCtx.Viper.Set(gaia.FlagSwingStoreExportDir, swingStoreExportPath)
 		}
-		// We unconditionally set FlagSwingStoreExportDir as for export, it makes
-		// little sense for users to control this location separately, and we don't
-		// want to override any swing-store artifacts that may be associated to the
-		// current genesis.
-		serverCtx.Viper.Set(gaia.FlagSwingStoreExportDir, swingStoreExportPath)
 
-		if hasVMController(serverCtx) {
+		if hasVMController(serverCtx) || swingStoreExportMode == swingset.SwingStoreExportModeSkip {
 			// Capture the export in the genesisPath.
 			// This will fail if a genesis.json already exists in the export-dir
 			genesisFile, err := os.OpenFile(
@@ -453,7 +480,16 @@ func (ac appCreator) appExport(
 	jailAllowedAddrs []string,
 	appOpts servertypes.AppOptions,
 ) (servertypes.ExportedApp, error) {
-	if OnExportHook != nil {
+	swingStoreExportMode, ok := appOpts.Get(gaia.FlagSwingStoreExportMode).(string)
+	if !(ok && allowedSwingSetExportModes[swingStoreExportMode]) {
+		return servertypes.ExportedApp{}, fmt.Errorf(
+			"export mode '%s' is not supported",
+			swingStoreExportMode,
+		)
+	}
+
+	// We don't have to launch VM in case the swing store export is not required
+	if swingStoreExportMode != swingset.SwingStoreExportModeSkip && OnExportHook != nil {
 		if err := OnExportHook(ac.agdServer, logger, appOpts); err != nil {
 			return servertypes.ExportedApp{}, err
 		}
@@ -464,10 +500,7 @@ func (ac appCreator) appExport(
 		return servertypes.ExportedApp{}, errors.New("application home is not set")
 	}
 
-	var loadLatest bool
-	if height == -1 {
-		loadLatest = true
-	}
+	loadLatest := height == -1
 
 	gaiaApp := gaia.NewAgoricApp(
 		ac.sender, ac.agdServer,

package/git-revision.txt

@@ -1 +1 @@
-ff46c4aac
+4e4d2b4ded