@agoric/cosmos 0.35.0-u18a.0 → 0.35.0-u19.0

package/CHANGELOG.md

@@ -3,79 +3,7 @@
 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
-
-
-
-
-
-## [0.35.0-u18.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.2...@agoric/cosmos@0.35.0-u18.3) (2024-12-09)
-
-**Note:** Version bump only for package @agoric/cosmos
-
-
-
-
-
-## [0.35.0-u18.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.1...@agoric/cosmos@0.35.0-u18.2) (2024-11-21)
-
-**Note:** Version bump only for package @agoric/cosmos
-
-
-
-
-
-## [0.35.0-u18.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u18.0...@agoric/cosmos@0.35.0-u18.1) (2024-11-19)
-
-**Note:** Version bump only for package @agoric/cosmos
-
-
-
-
-
-## [0.35.0-u18.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.34.1...@agoric/cosmos@0.35.0-u18.0) (2024-10-31)
+## [0.35.0-u19.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.34.1...@agoric/cosmos@0.35.0-u19.0) (2025-02-24)
 
 
 ### ⚠ BREAKING CHANGES
@@ -120,17 +48,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmos:** impose defaults when sending VM actions ([a710d68](https://github.com/Agoric/agoric-sdk/commit/a710d68512cf9983bdf5230e2e99f267521c7210))
 * **cosmos:** KVEntry implements json Marshaler and Unmarshaller ([1bba859](https://github.com/Agoric/agoric-sdk/commit/1bba8592eee0e24e480c407095f0f63ccca4a242))
 * **cosmos:** make vm comms use `context.Context` ([fa1754c](https://github.com/Agoric/agoric-sdk/commit/fa1754c791ba6c848e6b94f3a75051c6b4cc69f6))
-* **cosmos:** Next upgrade is agoric-upgrade-18 ([#10361](https://github.com/Agoric/agoric-sdk/issues/10361)) ([6ddbef0](https://github.com/Agoric/agoric-sdk/commit/6ddbef09f18c18f205e8d166c363ff4884115ce9))
+* **cosmos:** Next Upgrade is agoric-upgrade-19 ([e224889](https://github.com/Agoric/agoric-sdk/commit/e2248899164cf58ecdd086801453a8290fe222df))
 * **cosmos:** prevent VM port handlers from panicking ([afd6017](https://github.com/Agoric/agoric-sdk/commit/afd60170d453865cfa871a01e8d8a74ffef9221a))
 * **cosmos:** propagate and handle shutdown message ([ac12e6d](https://github.com/Agoric/agoric-sdk/commit/ac12e6d57b3a50e079744f7a6faced7f4bebb957))
 * **cosmos:** separate swing-store export data from genesis file ([f476bd5](https://github.com/Agoric/agoric-sdk/commit/f476bd50fb3ca5df0c4f43b20e059e05a2659b4c))
 * **cosmos:** separate vm server ([37e3254](https://github.com/Agoric/agoric-sdk/commit/37e325433b6024198d34052f3150951c33a29f62))
 * **cosmos:** spawn JS on export command ([592948d](https://github.com/Agoric/agoric-sdk/commit/592948dc2fada0a9d1f56581ccae42040bfe4a53))
+* **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:** support core proposals set by upgrade handler ([605eb4b](https://github.com/Agoric/agoric-sdk/commit/605eb4b8f33d7646c3a9084d43ecd51029e12b80))
 * **cosmos:** support snapshot export ([4386f8e](https://github.com/Agoric/agoric-sdk/commit/4386f8e67136f184b94febb5d65990a26e101cf3))
 * **cosmos:** un-wire x/crisis ([#8582](https://github.com/Agoric/agoric-sdk/issues/8582)) ([7153535](https://github.com/Agoric/agoric-sdk/commit/7153535c5c10fed309dc60f12f981c81841fdb93))
 * **cosmos:** upgrade provisioning vat ([#8901](https://github.com/Agoric/agoric-sdk/issues/8901)) ([174e37d](https://github.com/Agoric/agoric-sdk/commit/174e37d7499b372c33ecaf6e05f82f43ebfff902))
 * **cosmos:** upgrade skips proposals with no variant ([4ce1372](https://github.com/Agoric/agoric-sdk/commit/4ce13721201d9a62a40352d909f97a44d8e5b25d))
+* **cosmos:** use `x/vbank` ConsensusVersion to upgrade monitoring ([0e367d3](https://github.com/Agoric/agoric-sdk/commit/0e367d3e9870622acc8a38afe57c2b6cbe629341))
 * **cosmos:** use operational artifact level for swingset state export/restore ([161ddd3](https://github.com/Agoric/agoric-sdk/commit/161ddd34ca6c16da0ad3ef716fa5da3d2ba86b68))
 * **cosmos:** wire in vlocalchain to the Cosmos app ([3ea527d](https://github.com/Agoric/agoric-sdk/commit/3ea527d9844dcf2b5f2c60d1bfb1760e064ec0f7))
 * **cosmos:** wire new swingset port handler ([ea582bf](https://github.com/Agoric/agoric-sdk/commit/ea582bf7738f82d0abe5529ee1ac9f2e117c957a))
@@ -139,6 +69,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **golang/cosmos:** Support relative SLOGFILE while still requiring app.toml slogfile to be absolute ([a759010](https://github.com/Agoric/agoric-sdk/commit/a75901040fe2acc3470cdc6f95228958f399959e))
 * **golang:** bump PFM to v6.1.2 ([#9120](https://github.com/Agoric/agoric-sdk/issues/9120)) ([5c28f49](https://github.com/Agoric/agoric-sdk/commit/5c28f496976128e59e0e5a8f1a8c24f7b496527d))
 * **localchain:** make `localchain.query` and `queryMany` useful ([41209d5](https://github.com/Agoric/agoric-sdk/commit/41209d5b7c1de478d3f2ae709558e3e535c4ad8d))
+* 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)
 * new 'boot' package with bootstrap configs ([8e3173b](https://github.com/Agoric/agoric-sdk/commit/8e3173b0b86a3dc90b31164bc4272c54e46a6641))
 * pick up return-grants from latest cosmos-sdk ([a88eb8a](https://github.com/Agoric/agoric-sdk/commit/a88eb8a21fb914e49bf436eb86aa6be8b2546269))
 * remove vaults, auctions, and priceFeeds from upgrade.go ([d064567](https://github.com/Agoric/agoric-sdk/commit/d064567df87cad9c57ea6e9d918b650785d08089))
@@ -151,10 +82,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * tolerate missing files in gaia 3-way diff ([2e4d8d3](https://github.com/Agoric/agoric-sdk/commit/2e4d8d33ae77cc50b99bbdfa1083316b6cfb3584))
 * update ibc-go to v4, adapt packages and API ([0ec1b79](https://github.com/Agoric/agoric-sdk/commit/0ec1b79ea0419d8576d8806c3b670e730bf09dcd))
 * upgrade ibc-go to v6.2.1 ([fa4695d](https://github.com/Agoric/agoric-sdk/commit/fa4695dce10091a6ac0f1423a361d27986b70f26))
+* 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)
 * upgrade wallet-factory ([e370bff](https://github.com/Agoric/agoric-sdk/commit/e370bff50e00b7e134148332d1ccb410d626db1c))
 * Upgrade Zoe ([ef1e0a2](https://github.com/Agoric/agoric-sdk/commit/ef1e0a216c100de89b28923a7f13251ed48e8f36))
 * **vat-transfer:** first cut at working proposal ([2864bd5](https://github.com/Agoric/agoric-sdk/commit/2864bd5c12300c3595df9676bcfde894dbe59b29))
 * **vats:** upgrade the orchestration core ([c2d9530](https://github.com/Agoric/agoric-sdk/commit/c2d9530e2d891bd9412969a43a9c5728cc3c2721))
+* **vbank:** new param `allowed_monitoring_accounts` ([5ac4c52](https://github.com/Agoric/agoric-sdk/commit/5ac4c527b5a3e85bb14ba91a32bcbb6beb0097c9))
 * **vibc:** add `AsyncVersions` flag anticipating `ibc-go` ([ca5933c](https://github.com/Agoric/agoric-sdk/commit/ca5933cc41075dfba30c44cb3a987d9c721cd97d))
 * **vibc:** use triggers to raise targeted events ([b89aaca](https://github.com/Agoric/agoric-sdk/commit/b89aaca2afd7d0901fc06d7a6bab27aab38d389b))
 * **vlocalchain:** bare minimum implementation ([6e35dc6](https://github.com/Agoric/agoric-sdk/commit/6e35dc642ce08a199604b7888d4fb5bbbd4c7db1))
@@ -162,21 +95,29 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **vlocalchain:** use jsonpb.Marshaler for VLOCALCHAIN_EXECUTE_TX responses ([2140e92](https://github.com/Agoric/agoric-sdk/commit/2140e929f3ce2edda3151bf2fbc542ff8971b677))
 * vm-config package ([8b1ecad](https://github.com/Agoric/agoric-sdk/commit/8b1ecad8ab50db777bc11c3ee6fcdb37d6cb38b6))
 * **vocalchain:** use `OrigName: false` for query response marshalling ([84992e9](https://github.com/Agoric/agoric-sdk/commit/84992e976bbb65b8c4d77c88312296c35e98dab4))
+* **vtransfer:** extract base address from parameterized address ([3d44b53](https://github.com/Agoric/agoric-sdk/commit/3d44b5363324baa803a2d9523ce11ded7cce1ed1))
 * **vtransfer:** only intercept packets for registered targets ([554fa49](https://github.com/Agoric/agoric-sdk/commit/554fa490ca4e0cdd05ddf526eb946caf6be45e98))
+* **vtransfer:** port some `address-hooks.js` functions to Go ([159098b](https://github.com/Agoric/agoric-sdk/commit/159098bbfaddf4448da4778aa29fbc072aed80a9))
 * **vtransfer:** prefix action types with `VTRANSFER_` ([80d69e9](https://github.com/Agoric/agoric-sdk/commit/80d69e94488683ed6fa650f048e8fb0fcd025042))
 * **vtransfer:** save watched addresses to genesis ([89b50a0](https://github.com/Agoric/agoric-sdk/commit/89b50a082c63e236356f33d521cad5f15a4e80d2))
 * **vtransfer:** use `vibc` middleware ([f40c5c8](https://github.com/Agoric/agoric-sdk/commit/f40c5c8d9f691ed32a1a9b03c5938f93341629db))
+* **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:** add store data to genesis ([9df85cf](https://github.com/Agoric/agoric-sdk/commit/9df85cf4908d5f4dfa9c4adc7cb15b7bc7cd3893))
 * **x/swingset:** add WaitUntilSwingStoreExportDone ([05bbee5](https://github.com/Agoric/agoric-sdk/commit/05bbee53906591f3520a14f7580145c5a2593208))
 * **x/swingset:** allow taking snapshot latest height ([a1290ef](https://github.com/Agoric/agoric-sdk/commit/a1290eff74583838f096acfd9baddb6f623693a6))
+* **x/swingset:** allow third party to provision wallet ([#10923](https://github.com/Agoric/agoric-sdk/issues/10923)) ([d2b661f](https://github.com/Agoric/agoric-sdk/commit/d2b661fa059ece198d02b2d72e9611b666c3794f)), closes [#10912](https://github.com/Agoric/agoric-sdk/issues/10912)
 * **x/swingset:** auto-provision smart wallet ([20a5485](https://github.com/Agoric/agoric-sdk/commit/20a5485b96d072a4cee990b3c24f8fb441ea909f))
+* **x/swingset:** Define default vat cleanup budget as { default: 5, kv: 50 } ([d86ee6d](https://github.com/Agoric/agoric-sdk/commit/d86ee6d5cf0882a53ac3a6e3b802e4002c4c1d12))
 * **x/swingset:** export swing store in genesis ([598abf7](https://github.com/Agoric/agoric-sdk/commit/598abf73ac555bd7284c8a91a03c205dc62d9b0c))
 * **x/swingset:** import swing store from genesis state ([55ba7f6](https://github.com/Agoric/agoric-sdk/commit/55ba7f6c3d6a958d3eb5c6c8b191b649da05809f))
+* **x/swingset:** Read beansPerUnit in each message handler and pass down to helpers ([55b9b49](https://github.com/Agoric/agoric-sdk/commit/55b9b49d5f77be9db33ae132a8f7b7017a90d0a9))
 * **x/swingset:** refuse smart wallet messages if not provisioned ([75bd9a7](https://github.com/Agoric/agoric-sdk/commit/75bd9a7bf85bd9b3b9870d9cf42d63f08f0e4f68))
+* **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))
 * avoid broken goleveldb ([a2bfb34](https://github.com/Agoric/agoric-sdk/commit/a2bfb34d14806e6492fb3293bdfa24e2199d40c2))
 * **builders:** use proper `oracleBrand` subkey case ([52f02b7](https://github.com/Agoric/agoric-sdk/commit/52f02b75b6706ee455a32ff83617dd5afb7342a7))
 * **cosmic-swingset:** add missing bits for maxVatsOnline ([8c0c177](https://github.com/Agoric/agoric-sdk/commit/8c0c17752f7439db6f7aee9f88be1dedce2a1bf1))
@@ -192,6 +133,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmos:** no global state in `vm` ([ab02669](https://github.com/Agoric/agoric-sdk/commit/ab0266908ec9f36587d3521287808f7a30ed9207))
 * **cosmos:** only allow snapshot export at latest height ([#9601](https://github.com/Agoric/agoric-sdk/issues/9601)) ([6bc363b](https://github.com/Agoric/agoric-sdk/commit/6bc363b5624bab5fd151ec4889b5f5116f2cf53c)), closes [#9600](https://github.com/Agoric/agoric-sdk/issues/9600)
 * **cosmos:** prevent Golang error wrapping stack frame divergence ([3390d90](https://github.com/Agoric/agoric-sdk/commit/3390d902f42a96e502d459cad224d97c9971e307))
+* **cosmos:** return an error if version is unsupported ([d17e55b](https://github.com/Agoric/agoric-sdk/commit/d17e55b5d5c0a178e49ed9a0402ed52827074426))
 * **cosmos:** Support building on Linux aarch64 ([ff2e5ed](https://github.com/Agoric/agoric-sdk/commit/ff2e5ed20e52e6484a6cba126b0739b0b1fc6360))
 * **cosmos:** update more `vtransfer` app.go wiring ([a171561](https://github.com/Agoric/agoric-sdk/commit/a1715615a01fce060eb990e1b2bb9a6d6a2a3566))
 * **cosmos:** use dedicated dedicate app creator for non start commands ([84208e9](https://github.com/Agoric/agoric-sdk/commit/84208e99f5a6f57988cabe4d3f3108f72c579436))
@@ -219,9 +161,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **vtransfer:** implement and manually test middleware ([23e3da9](https://github.com/Agoric/agoric-sdk/commit/23e3da9b3c1e621d46d5f9b0c7896c746f9e99f3))
 * **vtransfer:** refactor and minor improvements ([803e381](https://github.com/Agoric/agoric-sdk/commit/803e38105de4047ccd7feeae2db3a512d43d2f93))
 * **vtransfer:** some separation of keeper duties ([96fdbdf](https://github.com/Agoric/agoric-sdk/commit/96fdbdf7f39d785956214e3a2f1ef2f15a520a19))
+* **vtransfer:** some tweaks for ack handling ([fab004b](https://github.com/Agoric/agoric-sdk/commit/fab004b2b8e141c70e8331de0817b3c439ad48f2))
 * **x/swingset:** enforce snapshot restore before init ([35f03f9](https://github.com/Agoric/agoric-sdk/commit/35f03f9f2b72b47475a3ae4c5068bee60c1278da))
 * **x/swingset:** guard snapshot restore for concurrency ([554a110](https://github.com/Agoric/agoric-sdk/commit/554a1102a08f466dad5d8291044150236896ec7a))
 * **x/swingset:** handle defer errors on export write ([f1eacbe](https://github.com/Agoric/agoric-sdk/commit/f1eacbec22eb52955266e401b83bc2e324b5bde5))
+* **x/swingset:** Let migration see incomplete Params structs ([315cdd5](https://github.com/Agoric/agoric-sdk/commit/315cdd56e0955ba26d624ca3a4997888abc1d635))
 * **x/swingset:** switch export/import to replay artifact level ([6ab24b2](https://github.com/Agoric/agoric-sdk/commit/6ab24b299f31affc0a638cc6352678a2c167044c))
 * **x/vstorage:** value can be empty in genesis data ([b8a817d](https://github.com/Agoric/agoric-sdk/commit/b8a817dfa70c225741a32fb73780de75c5aa9184))
 

package/app/app.go

@@ -894,7 +894,7 @@ func NewAgoricApp(
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			upgrade18aHandler(app, name),
+			upgrade19Handler(app, name),
 		)
 	}
 

package/app/upgrade.go

@@ -1,7 +1,11 @@
 package gaia
 
 import (
+	"encoding/json"
 	"fmt"
+	"reflect"
+	"strings"
+	"text/template"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	swingsetkeeper "github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/keeper"
@@ -11,7 +15,11 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"agoric-upgrade-18a",
+	"agoric-upgrade-19-mainnet",
+	"agoric-upgrade-19-devnet",
+	"agoric-upgrade-19-emerynet",
+	"agoric-upgrade-19-a3p",
+	"agoric-upgrade-19-basic",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -45,7 +53,11 @@ func isPrimaryUpgradeName(name string) bool {
 		return false
 	}
 	switch name {
-	case validUpgradeName("agoric-upgrade-18a"):
+	case validUpgradeName("agoric-upgrade-19-mainnet"),
+		validUpgradeName("agoric-upgrade-19-devnet"),
+		validUpgradeName("agoric-upgrade-19-emerynet"),
+		validUpgradeName("agoric-upgrade-19-a3p"),
+		validUpgradeName("agoric-upgrade-19-basic"):
 		return true
 	default:
 		panic(fmt.Errorf("unexpected upgrade name %s", validUpgradeName(name)))
@@ -63,24 +75,93 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	return true
 }
 
-// func upgradeMintHolderCoreProposal(upgradeName string) (vm.CoreProposalStep, error) {
-// 	variant := getVariantFromUpgradeName(upgradeName)
+func buildProposalStepWithArgs(moduleName string, entrypoint string, extra any) (vm.CoreProposalStep, error) {
+	t := template.Must(template.New("").Parse(`{
+  "module": "{{.moduleName}}",
+  "entrypoint": "{{.entrypoint}}",
+  "args": {{.args}}
+}`))
+
+	var args []byte
+	var err error
+	if extra == nil {
+		// The specified entrypoint will be called with no extra arguments after powers.
+		args = []byte(`[]`)
+	} else if reflect.TypeOf(extra).Kind() == reflect.Map && reflect.TypeOf(extra).Key().Kind() == reflect.String {
+		// The specified entrypoint will be called with this options argument after powers.
+		args, err = json.Marshal([]any{extra})
+	} else if reflect.TypeOf(extra).Kind() == reflect.Slice {
+		// The specified entrypoint will be called with each of these arguments after powers.
+		args, err = json.Marshal(extra)
+	} else {
+		return nil, fmt.Errorf("proposal extra must be nil, array, or string map, not %v", extra)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	var result strings.Builder
+	err = t.Execute(&result, map[string]any{
+		"moduleName": moduleName,
+		"entrypoint": entrypoint,
+		"args":       string(args),
+	})
+	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
+}
 
-// 	if variant == "" {
-// 		return nil, nil
-// 	}
+func getVariantFromUpgradeName(upgradeName string) string {
+	switch upgradeName {
+	case "agoric-upgrade-19-a3p":
+		return "A3P_INTEGRATION"
+	case "agoric-upgrade-19-mainnet":
+		return "MAINNET"
+	case "agoric-upgrade-19-devnet":
+		return "DEVNET"
+	case "agoric-upgrade-19-emerynet":
+		return "EMERYNET"
+	case "agoric-upgrade-19-basic":
+		// Noupgrade for this version.
+		return ""
+	default:
+		return ""
+	}
+}
 
-// 	return buildProposalStepWithArgs(
-// 		"@agoric/builders/scripts/vats/upgrade-mintHolder.js",
-// 		"defaultProposalBuilder",
-// 		map[string]any{
-// 			"variant": variant,
-// 		},
-// 	)
-// }
+func upgradeMintHolderCoreProposal(targetUpgrade string) (vm.CoreProposalStep, error) {
+	return buildProposalStepFromScript(targetUpgrade, "@agoric/builders/scripts/vats/upgrade-mintHolder.js")
+}
 
-// 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) {
+func restartFeeDistributorCoreProposal(targetUpgrade string) (vm.CoreProposalStep, error) {
+	return buildProposalStepFromScript(targetUpgrade, "@agoric/builders/scripts/inter-protocol/replace-feeDistributor-combo.js")
+}
+
+func buildProposalStepFromScript(targetUpgrade string, builderScript string) (vm.CoreProposalStep, error) {
+	variant := getVariantFromUpgradeName(targetUpgrade)
+
+	if variant == "" {
+		return nil, nil
+	}
+
+	return buildProposalStepWithArgs(
+		builderScript,
+		"defaultProposalBuilder",
+		map[string]any{
+			"variant": variant,
+		},
+	)
+}
+
+// upgrade19Handler performs standard upgrade actions plus custom actions for upgrade-19.
+func upgrade19Handler(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)
 
@@ -96,37 +177,53 @@ func upgrade18aHandler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upg
 				return module.VersionMap{}, fmt.Errorf("cannot run %s as first upgrade", plan.Name)
 			}
 
-			// 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,
+				// Register a new ZCF to be used for all future contract instances and upgrades
+				vm.CoreProposalStepForModules(
+					"@agoric/builders/scripts/vats/upgrade-zcf.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",
+				),
+			)
+
+			upgradeMintHolderStep, err := upgradeMintHolderCoreProposal(targetUpgrade)
+			if err != nil {
+				return nil, err
+			} else if upgradeMintHolderStep != nil {
+				CoreProposalSteps = append(CoreProposalSteps, upgradeMintHolderStep)
+			}
+			restartFeeDistributorStep, err := restartFeeDistributorCoreProposal(targetUpgrade)
+			if err != nil {
+				return nil, err
+			} else if restartFeeDistributorStep != nil {
+				CoreProposalSteps = append(CoreProposalSteps, restartFeeDistributorStep)
+			}
 
+			CoreProposalSteps = append(CoreProposalSteps,
+				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",
+				),
+				vm.CoreProposalStepForModules(
+					"@agoric/builders/scripts/vats/upgrade-psm.js",
+				),
+			)
 		}
 
 		app.upgradeDetails = &upgradeDetails{

package/git-revision.txt

@@ -1 +1 @@
-4e4d2b4ded
+29e9704c37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmos",
-  "version": "0.35.0-u18a.0",
+  "version": "0.35.0-u19.0",
   "description": "Connect JS to the Cosmos blockchain SDK",
   "parsers": {
     "js": "mjs"
@@ -9,7 +9,6 @@
   "engines": {
     "node": "^18.12 || ^20.9"
   },
-  "packageManager": "yarn@1.22.22",
   "scripts": {
     "test": "exit 0",
     "build:all": "make",
@@ -39,5 +38,5 @@
   "typeCoverage": {
     "atLeast": 0
   },
-  "gitHead": "4e4d2b4dedc5a268178712fc6beb89496518480a"
+  "gitHead": "29e9704c375a06bb617027093b30d2d25faa6471"
 }

package/x/swingset/keeper/keeper.go

@@ -380,7 +380,7 @@ func makeFeeMenu(powerFlagFees []types.PowerFlagFee) map[string]sdk.Coins {
 
 var privilegedProvisioningCoins sdk.Coins = sdk.NewCoins(sdk.NewInt64Coin("provisionpass", 1))
 
-func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlags []string, powerFlagFees []types.PowerFlagFee) (sdk.Coins, error) {
+func calculateFees(balances sdk.Coins, powerFlags []string, powerFlagFees []types.PowerFlagFee) (sdk.Coins, error) {
 	fees := sdk.NewCoins()
 
 	// See if we have the balance needed for privileged provisioning.
@@ -389,10 +389,6 @@ func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlag
 		return fees, nil
 	}
 
-	if !submitter.Equals(addr) {
-		return nil, fmt.Errorf("submitter is not the same as target address for fee-based provisioning")
-	}
-
 	if len(powerFlags) == 0 {
 		return nil, fmt.Errorf("must specify powerFlags for fee-based provisioning")
 	}
@@ -412,9 +408,9 @@ func calculateFees(balances sdk.Coins, submitter, addr sdk.AccAddress, powerFlag
 	return fees, nil
 }
 
-func (k Keeper) ChargeForProvisioning(ctx sdk.Context, submitter, addr sdk.AccAddress, powerFlags []string) error {
+func (k Keeper) ChargeForProvisioning(ctx sdk.Context, submitter sdk.AccAddress, powerFlags []string) error {
 	balances := k.bankKeeper.GetAllBalances(ctx, submitter)
-	fees, err := calculateFees(balances, submitter, addr, powerFlags, k.GetParams(ctx).PowerFlagFees)
+	fees, err := calculateFees(balances, powerFlags, k.GetParams(ctx).PowerFlagFees)
 	if err != nil {
 		return err
 	}

package/x/swingset/keeper/keeper_test.go

@@ -61,15 +61,6 @@ func Test_calculateFees(t *testing.T) {
 			},
 			want: cns(),
 		},
-		{
-			name: "cannot pay fee to provision third party",
-			args: args{
-				submitter:  submitAddr,
-				addr:       utilAddr,
-				powerFlags: []string{"powerflag1"},
-			},
-			errMsg: "submitter is not the same as target address for fee-based provisioning",
-		},
 		{
 			name: "need powerflags for fee provisioning",
 			args: args{
@@ -106,6 +97,21 @@ func Test_calculateFees(t *testing.T) {
 			},
 			want: cns(a(1300)),
 		},
+		{
+			name: "can pay fee to provision third party",
+			args: args{
+				submitter:  submitAddr,
+				addr:       utilAddr,
+				powerFlags: []string{"power1"},
+				powerFlagFees: []types.PowerFlagFee{
+					{
+						PowerFlag: "power1",
+						Fee:       cns(a(1000)),
+					},
+				},
+			},
+			want: cns(a(1000)),
+		},
 		{
 			name: "later menu entries do not override",
 			args: args{
@@ -173,7 +179,7 @@ func Test_calculateFees(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := calculateFees(tt.args.balances, tt.args.submitter, tt.args.addr, tt.args.powerFlags, tt.args.powerFlagFees)
+			got, err := calculateFees(tt.args.balances, tt.args.powerFlags, tt.args.powerFlagFees)
 			var errMsg string
 			if err != nil {
 				errMsg = err.Error()

package/x/swingset/keeper/msg_server.go

@@ -158,7 +158,7 @@ func (keeper msgServer) provisionIfNeeded(ctx sdk.Context, owner sdk.AccAddress)
 func (keeper msgServer) Provision(goCtx context.Context, msg *types.MsgProvision) (*types.MsgProvisionResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
-	err := keeper.ChargeForProvisioning(ctx, msg.Submitter, msg.Address, msg.PowerFlags)
+	err := keeper.ChargeForProvisioning(ctx, msg.Submitter, msg.PowerFlags)
 	if err != nil {
 		return nil, err
 	}