@agoric/cosmos 0.34.2-upgrade-16-dev-0549112.0 → 0.34.2-upgrade-16-dev-b7c2f02.0

package/app/upgrade.go

@@ -1,11 +1,6 @@
 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"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,10 +9,7 @@ import (
 )
 
 var upgradeNamesOfThisVersion = map[string]bool{
-	"agoric-upgrade-16-basic":           true, // no-frills
-	"agoric-upgrade-16-a3p-integration": true,
-	"agoric-upgrade-16-main":            true,
-	"agoric-upgrade-16-devnet":          true,
+	"agoric-upgrade-16": true,
 }
 
 func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
@@ -29,132 +21,6 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	return true
 }
 
-// upgradePriceFeedCoreProposalSteps returns the core proposal steps for the
-// price feed upgrade and associated changes to scaledPriceAuthority and
-// vaultManager.
-func upgradePriceFeedCoreProposalSteps(upgradeName string) ([]vm.CoreProposalStep, error) {
-	isThisUpgrade := func(expectedUpgradeName string) bool {
-		if !upgradeNamesOfThisVersion[expectedUpgradeName] {
-			panic(fmt.Errorf("invalid upgrade name: %s", expectedUpgradeName))
-		}
-		return upgradeName == expectedUpgradeName
-	}
-
-	t := template.Must(template.New("").Parse(`{
-		"module": "@agoric/builders/scripts/vats/priceFeedSupport.js",
-    "entrypoint": {{.entrypointJson}},
-		"args": [{
-			"AGORIC_INSTANCE_NAME": {{.instanceNameJson}},
-			"ORACLE_ADDRESSES": {{.oracleAddressesJson}},
-			"IN_BRAND_LOOKUP": {{.inBrandLookupJson}},
-			"IN_BRAND_DECIMALS": 6,
-			"OUT_BRAND_LOOKUP": ["agoricNames", "oracleBrand", "USD"],
-			"OUT_BRAND_DECIMALS": 4
-		}]
-	}`))
-
-	var oracleAddresses []string
-
-	var entrypoint string
-	switch {
-	case isThisUpgrade("agoric-upgrade-16-a3p-integration"):
-		entrypoint = "deprecatedPriceFeedProposalBuilder"
-	case isThisUpgrade("agoric-upgrade-16-main"):
-		oracleAddresses = []string{
-			"agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78", // DSRV
-			"agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p", // Stakin
-			"agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8", // 01node
-			"agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr", // Simply Staking
-			"agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj", // P2P
-		}
-		entrypoint = "strictPriceFeedProposalBuilder"
-	case isThisUpgrade("agoric-upgrade-16-devnet"):
-		oracleAddresses = []string{
-			"agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft", // DSRV
-			"agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82", // Stakin
-			"agoric1ra0g6crtsy6r3qnpu7ruvm7qd4wjnznyzg5nu4", // 01node
-			"agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf", // Simply Staking
-			"agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk", // P2P
-		}
-		entrypoint = "strictPriceFeedProposalBuilder"
-
-	// No price feed upgrade for this version.
-	case isThisUpgrade("agoric-upgrade-16-basic"):
-	}
-
-	if entrypoint == "" {
-		return []vm.CoreProposalStep{}, nil
-	}
-
-	entrypointJson, err := json.Marshal(entrypoint)
-	if err != nil {
-		return nil, err
-	}
-
-	var inBrandNames []string
-	switch {
-	case isThisUpgrade("agoric-upgrade-16-a3p-integration"), isThisUpgrade("agoric-upgrade-16-main"):
-		inBrandNames = []string{
-			"ATOM",
-			"stATOM",
-			"stOSMO",
-			"stTIA",
-			"stkATOM",
-		}
-	case isThisUpgrade("agoric-upgrade-16-devnet"):
-		inBrandNames = []string{
-			"ATOM",
-			"stTIA",
-			"stkATOM",
-		}
-	}
-
-	oracleAddressesJson, err := json.Marshal(oracleAddresses)
-	if err != nil {
-		return nil, err
-	}
-
-	proposals := make(vm.CoreProposalStep, 0, len(inBrandNames))
-	for _, inBrandName := range inBrandNames {
-		instanceName := inBrandName + "-USD price feed"
-		instanceNameJson, err := json.Marshal(instanceName)
-		if err != nil {
-			return nil, err
-		}
-		inBrandLookup := []string{"agoricNames", "oracleBrand", inBrandName}
-		inBrandLookupJson, err := json.Marshal(inBrandLookup)
-		if err != nil {
-			return nil, err
-		}
-
-		var result strings.Builder
-		err = t.Execute(&result, map[string]any{
-			"entrypointJson":      string(entrypointJson),
-			"inBrandLookupJson":   string(inBrandLookupJson),
-			"instanceNameJson":    string(instanceNameJson),
-			"oracleAddressesJson": string(oracleAddressesJson),
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		jsonStr := result.String()
-		jsonBz := []byte(jsonStr)
-		if !json.Valid(jsonBz) {
-			return nil, fmt.Errorf("invalid JSON: %s", jsonStr)
-		}
-		proposals = append(proposals, vm.ArbitraryCoreProposal{Json: jsonBz})
-	}
-	return []vm.CoreProposalStep{
-		// Add new vats for price feeds. The existing ones will be retired shortly.
-		vm.CoreProposalStepForModules(proposals...),
-		// Add new auction contract. The old one will be retired shortly.
-		vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/add-auction.js"),
-		// upgrade vaultFactory.
-		vm.CoreProposalStepForModules("@agoric/builders/scripts/vats/upgradeVaults.js"),
-	}, nil
-}
-
 // upgrade16Handler performs standard upgrade actions plus custom actions for upgrade-16.
 func upgrade16Handler(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) {
@@ -182,11 +48,6 @@ func upgrade16Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgr
 					"@agoric/builders/scripts/vats/init-transfer.js",
 				),
 			}
-			priceFeedSteps, err := upgradePriceFeedCoreProposalSteps(targetUpgrade)
-			if err != nil {
-				return nil, err
-			}
-			CoreProposalSteps = append(CoreProposalSteps, priceFeedSteps...)
 		}
 
 		app.upgradeDetails = &upgradeDetails{

package/daemon/cmd/root.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -452,7 +453,7 @@ func replaceCosmosSnapshotExportCommand(cmd *cobra.Command, ac appCreator) {
 	replacedRunE := func(cmd *cobra.Command, args []string) error {
 		ctx := server.GetServerContextFromCmd(cmd)
 
-		height, err := cmd.Flags().GetInt64("height")
+		heightFlag, err := cmd.Flags().GetInt64("height")
 		if err != nil {
 			return err
 		}
@@ -467,13 +468,15 @@ func replaceCosmosSnapshotExportCommand(cmd *cobra.Command, ac appCreator) {
 		app := ac.newSnapshotsApp(ctx.Logger, db, nil, ctx.Viper)
 		gaiaApp := app.(*gaia.GaiaApp)
 
-		if height == 0 {
-			height = app.CommitMultiStore().LastCommitID().Version
+		latestHeight := app.CommitMultiStore().LastCommitID().Version
+
+		if heightFlag != 0 && latestHeight != heightFlag {
+			return fmt.Errorf("cannot export at height %d, only latest height %d is supported", heightFlag, latestHeight)
 		}
 
-		cmd.Printf("Exporting snapshot for height %d\n", height)
+		cmd.Printf("Exporting snapshot for height %d\n", latestHeight)
 
-		err = gaiaApp.SwingSetSnapshotter.InitiateSnapshot(height)
+		err = gaiaApp.SwingSetSnapshotter.InitiateSnapshot(latestHeight)
 		if err != nil {
 			return err
 		}
@@ -488,7 +491,7 @@ func replaceCosmosSnapshotExportCommand(cmd *cobra.Command, ac appCreator) {
 			return err
 		}
 
-		snapshotHeight := uint64(height)
+		snapshotHeight := uint64(latestHeight)
 
 		for _, snapshot := range snapshotList {
 			if snapshot.Height == snapshotHeight {

package/git-revision.txt

@@ -1 +1 @@
-0549112
+b7c2f02

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-upgrade-16-dev-0549112.0+0549112",
+  "version": "0.34.2-upgrade-16-dev-b7c2f02.0+b7c2f02",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -39,5 +39,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "05491122ee61362c8310a7924ac67f033b02e38f"
+  "gitHead": "b7c2f02873a830fc76909505a8637a69a72f1adb"
 }