@agoric/cosmos 0.34.2-upgrade-18-dev-d7c994b.0 → 0.34.2-upgrade-18-dev-ef001c0.0

package/app/upgrade.go

@@ -79,10 +79,10 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, opts map[st
 	t := template.Must(template.New("").Parse(`{
 		"module": "{{.moduleName}}",
 		"entrypoint": "{{.entrypoint}}",
-		"args": [ {{.args}} ]
+		"args": [ {{.optsArg}} ]
 	}`))
 
-	args, err := json.Marshal(opts)
+	optsArg, err := json.Marshal(opts)
 	if err != nil {
 		return nil, err
 	}
@@ -91,7 +91,7 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, opts map[st
 	err = t.Execute(&result, map[string]any{
 		"moduleName": moduleName,
 		"entrypoint": entrypoint,
-		"args":       string(args),
+		"optsArg":    string(optsArg),
 	})
 	if err != nil {
 		return nil, err
@@ -106,23 +106,27 @@ func buildProposalStepWithArgs(moduleName string, entrypoint string, opts map[st
 }
 
 func getVariantFromUpgradeName(upgradeName string) string {
-    switch upgradeName {
-    case "UNRELEASED_A3P_INTEGRATION":
-        return "A3P_INTEGRATION"
-    case "UNRELEASED_main":
-        return "MAINNET"
-    case "UNRELEASED_devnet":
-        return "DEVNET"
-	// Noupgrade for this version.
-    case "UNRELEASED_BASIC":
-        return ""
-    default:
-        return ""
-    }
+	switch upgradeName {
+	case "UNRELEASED_A3P_INTEGRATION":
+		return "A3P_INTEGRATION"
+	case "UNRELEASED_main":
+		return "MAINNET"
+	case "UNRELEASED_devnet":
+		return "DEVNET"
+		// Noupgrade for this version.
+	case "UNRELEASED_BASIC":
+		return ""
+	default:
+		return ""
+	}
 }
 
 func replaceElectorateCoreProposalStep(upgradeName string) (vm.CoreProposalStep, error) {
-    variant := getVariantFromUpgradeName(upgradeName)
+	variant := getVariantFromUpgradeName(upgradeName)
+
+	if variant == "" {
+		return nil, nil
+	}
 
 	return buildProposalStepWithArgs(
 		"@agoric/builders/scripts/inter-protocol/replace-electorate-core.js",
@@ -134,7 +138,11 @@ func replaceElectorateCoreProposalStep(upgradeName string) (vm.CoreProposalStep,
 }
 
 func replacePriceFeedsCoreProposal(upgradeName string) (vm.CoreProposalStep, error) {
-    variant := getVariantFromUpgradeName(upgradeName)
+	variant := getVariantFromUpgradeName(upgradeName)
+
+	if variant == "" {
+		return nil, nil
+	}
 
 	return buildProposalStepWithArgs(
 		"@agoric/builders/scripts/inter-protocol/updatePriceFeeds.js",
@@ -165,33 +173,42 @@ func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Conte
 			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",
+					),
+				)
 			}
 
 			// Each CoreProposalStep runs sequentially, and can be constructed from
 			// one or more modules executing in parallel within the step.
-			CoreProposalSteps = []vm.CoreProposalStep{
-				replaceElectorateStep,
-				priceFeedUpdate,
+			CoreProposalSteps = append(CoreProposalSteps,
 				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/add-auction.js",
+					// Upgrade Zoe (no new ZCF needed).
+					"@agoric/builders/scripts/vats/upgrade-zoe.js",
 				),
+				// Revive KREAd characters
 				vm.CoreProposalStepForModules(
-					"@agoric/builders/scripts/vats/upgradeVaults.js",
+					"@agoric/builders/scripts/vats/revive-kread.js",
 				),
 				vm.CoreProposalStepForModules(
-					// Upgrade Zoe (no new ZCF needed).
-					"@agoric/builders/scripts/vats/upgrade-zoe.js",
+					// Upgrade to include a cleanup from https://github.com/Agoric/agoric-sdk/pull/10319
+					"@agoric/builders/scripts/smart-wallet/build-wallet-factory2-upgrade.js",
 				),
-                // Revive KREAd characters
-                vm.CoreProposalStepForModules(
-                    "@agoric/builders/scripts/vats/revive-kread.js",
-                ),
-			}
+			)
 		}
 
 		app.upgradeDetails = &upgradeDetails{

package/cmd/agd/agvm.go

@@ -27,9 +27,9 @@ func NewVMCommand(logger log.Logger, binary string, args []string, vmFromAgd, vm
 	fdToAgd := fdFromAgd + 1
 
 	// ExtraFiles begins at fd numStdFiles, so we need to compute the array.
-	cmd.ExtraFiles = make([]*os.File, fdToAgd - numStdFiles + 1)
-	cmd.ExtraFiles[fdFromAgd - numStdFiles] = vmFromAgd
-	cmd.ExtraFiles[fdToAgd - numStdFiles] = vmToAgd
+	cmd.ExtraFiles = make([]*os.File, fdToAgd-numStdFiles+1)
+	cmd.ExtraFiles[fdFromAgd-numStdFiles] = vmFromAgd
+	cmd.ExtraFiles[fdToAgd-numStdFiles] = vmToAgd
 
 	// Pass the file descriptor numbers in the environment.
 	cmd.Env = append(

package/cmd/agd/find_binary.go

@@ -8,7 +8,7 @@ import (
 
 // FindBinaryNextToMe looks for binName next to the current executable.
 // It returns an absolute filename for binName, or an error.
-func FindBinaryNextToMe(walkUp int, path... string) (string, error) {
+func FindBinaryNextToMe(walkUp int, path ...string) (string, error) {
 	ex, err := os.Executable()
 	if err != nil {
 		return "", err
@@ -32,7 +32,7 @@ func FindBinaryNextToMe(walkUp int, path... string) (string, error) {
 	if _, err = os.Stat(bin); err != nil {
 		return "", err
 	}
-	
+
 	return bin, nil
 }
 

package/git-revision.txt

@@ -1 +1 @@
-d7c994b
+ef001c0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.34.2-upgrade-18-dev-d7c994b.0+d7c994b",
+  "version": "0.34.2-upgrade-18-dev-ef001c0.0+ef001c0",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -39,5 +39,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "d7c994b8d33c0cd22b257f3e33b579588ab6c6d8"
+  "gitHead": "ef001c015ac66ff65840bee1f7fd3847e999154d"
 }

package/vm/client.go

@@ -12,8 +12,8 @@ const ReceiveMessageMethod = "agvm.ReceiveMessage"
 
 // Message is what we send to the VM.
 type Message struct {
-	Port int
-	Data string
+	Port       int
+	Data       string
 	NeedsReply bool
 }
 
@@ -24,7 +24,9 @@ var _ rpc.ClientCodec = (*ClientCodec)(nil)
 // runtime and the VM in the single-process dual-runtime configuration.
 //
 // We expect to call it via the legacy API with signature:
-//    sendToController func(needsReply bool, msg string) (string, error)
+//
+//	sendToController func(needsReply bool, msg string) (string, error)
+//
 // where msg and the returned string are JSON-encoded values.
 //
 // Note that the net/rpc framework cannot express a call that does not expect a
@@ -32,22 +34,22 @@ var _ rpc.ClientCodec = (*ClientCodec)(nil)
 // having the WriteRequest() method fabricate a Receive() call to clear the rpc
 // state.
 type ClientCodec struct {
-	ctx context.Context
-	send func(port, rPort int, msg string)
-	outbound map[int]rpc.Request
-	inbound chan *rpc.Response
-	replies map[uint64]string
+	ctx         context.Context
+	send        func(port, rPort int, msg string)
+	outbound    map[int]rpc.Request
+	inbound     chan *rpc.Response
+	replies     map[uint64]string
 	replyToRead uint64
 }
 
 // NewClientCodec creates a new ClientCodec.
 func NewClientCodec(ctx context.Context, send func(int, int, string)) *ClientCodec {
 	return &ClientCodec{
-		ctx: ctx,
-		send: send,
+		ctx:      ctx,
+		send:     send,
 		outbound: make(map[int]rpc.Request),
-		inbound: make(chan *rpc.Response),
-		replies: make(map[uint64]string),
+		inbound:  make(chan *rpc.Response),
+		replies:  make(map[uint64]string),
 	}
 }
 
@@ -97,7 +99,7 @@ func (cc *ClientCodec) Receive(rPort int, isError bool, data string) error {
 	delete(cc.outbound, rPort)
 	resp := &rpc.Response{
 		ServiceMethod: outb.ServiceMethod,
-		Seq: outb.Seq,
+		Seq:           outb.Seq,
 	}
 	if isError {
 		resp.Error = data

package/x/vbank/types/key.go

@@ -7,7 +7,7 @@ const (
 	// StoreKey to be used when creating the KVStore
 	StoreKey = ModuleName
 
-	ReservePoolName  = "vbank/reserve"
-	GiveawayPoolName = "vbank/giveaway"
-	ProvisionPoolName  = "vbank/provision"
+	ReservePoolName   = "vbank/reserve"
+	GiveawayPoolName  = "vbank/giveaway"
+	ProvisionPoolName = "vbank/provision"
 )