Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ZCF only #9250

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Upgrade ZCF only #9250

merged 2 commits into from
Apr 18, 2024

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Apr 17, 2024

refs: #9246

Description

Add a proposal to upgrade the ZCF bundle only, and run it as a core proposal during chain software upgrade. This is necessary for #9246 but not sufficient as the release also needs to include the fix from #8911.

Security Considerations

None

Scaling Considerations

None

Documentation Considerations

None

Testing Considerations

Will be tested end to end (make sure smart wallet can be upgraded) in #9206

Upgrade Considerations

@gibson042 must do a partial cherry-pick of 72c7574#diff-8dcfebb96abffde204086c5d660142e0c4c74a7bac0800f7c18447e0baad1979 (the zcfZygote.js change) in the release-15 branch.

Will be part of that chain software upgrade.

@mhofman mhofman requested review from dckc and Chris-Hibbert April 17, 2024 19:35
@mhofman mhofman added the automerge:rebase Automatically rebase updates, then merge label Apr 17, 2024
@dckc
Copy link
Member

dckc commented Apr 17, 2024

looking good...

#24 69.11 2024-04-17T19:45:41.532Z SwingSet: kernel: vat v11 upgraded from incarnation 0 to 1 with source b1-6aac6dd164753a2f8fc84c9915e31257b6b255869cfd4a60ce58bbc579b6a33002b7a6fa87924b6c4183f514b2174f5366626482179c1997d15dec92fd70313f

p.s. oh... that's during yarn build, not yarn test

@dckc
Copy link
Member

dckc commented Apr 17, 2024

I'm a little surprised to see orchestration stuff mixed in before running probeZcfBundleCap. But I guess it's OK.

yarn build:

#24 67.96 2024-04-17T19:45:40.385Z SwingSet: vat: v1: coreProposal: upgradeZcfOnly
#24 68.09 2024-04-17T19:45:40.519Z SwingSet: vat: v1: coreProposal: upgradeProvisioningVat
#24 70.52 2024-04-17T19:45:42.942Z SwingSet: vat: v1: coreProposal: setupNetworkProtocols

#46 45.33 2024-04-17T19:47:46.241Z SwingSet: vat: v1: coreProposal: testLocalChain

#77 38.07 2024-04-17T19:49:16.862Z SwingSet: vat: v1: coreProposal: startStakeBld

yarn test:

2024-04-17T19:52:01.725Z SwingSet: vat: v1: coreProposal: probeZcfBundleCap

https://github.com/Agoric/agoric-sdk/actions/runs/8727691415/job/23945753923?pr=9250

Copy link
Member

@dckc dckc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this fits the bill.

Copy link
Contributor

@Chris-Hibbert Chris-Hibbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mhofman mhofman force-pushed the mhofman/9246-upgrade-zcf branch from 8fd42e5 to f942986 Compare April 18, 2024 15:06
Copy link

cloudflare-workers-and-pages bot commented Apr 18, 2024

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: f942986
Status: ✅  Deploy successful!
Preview URL: https://4119974b.agoric-sdk.pages.dev
Branch Preview URL: https://mhofman-9246-upgrade-zcf.agoric-sdk.pages.dev

View logs

@mergify mergify bot merged commit e6cde48 into master Apr 18, 2024
67 checks passed
@mergify mergify bot deleted the mhofman/9246-upgrade-zcf branch April 18, 2024 15:39
Chris-Hibbert added a commit that referenced this pull request Apr 18, 2024
Chris-Hibbert added a commit that referenced this pull request Apr 18, 2024
Chris-Hibbert added a commit that referenced this pull request Apr 18, 2024
gibson042 added a commit that referenced this pull request Apr 20, 2024
Created by following the [pending
MAINTAINERS.md](https://github.com/Agoric/agoric-sdk/pull/9235/files?short_path=39da3bd#diff-39da3bd6270d44ea37b6ed50bd42eeb9d93ac5e1639645871a69cbe08cbe29de),
branching from dev-upgrade-15.

NOTE:
[scripts/have-news](https://github.com/Agoric/agoric-sdk/blob/master/scripts/have-news)
has an undocumented dependency upon src-prefix="a" that was disrupted by
my local
[`diff.mnemonicPrefix=true`](https://git-scm.com/docs/diff-config/2.9.5#Documentation/diff-config.txt-diffmnemonicPrefix)
configuration, resulting in empty output until I tracked down the issue.
I've opened #9269 to track that.

## Packages that have NEWS.md updates

```diff
--- c/golang/cosmos/CHANGELOG.md
+++ w/golang/cosmos/CHANGELOG.md
@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.35.0-u15.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-04-20)
+
+
+### Features
+
+* upgrade zcf: install bundle and call updateZcfBundleId() ([74662d7](74662d7)), closes [#9250](#9250)
+* **cosmos:** Next upgrade is `agoric-upgrade-15` ([6a84bb1](6a84bb1))
+
+
+### Bug Fixes
+
+* various fixes and features for u15 ([21e6f7c](21e6f7c))
+
+
+
 ## [0.35.0-u14.1](https://github.com/gibson042/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-03-12)
 
 
--- c/packages/smart-wallet/CHANGELOG.md
+++ w/packages/smart-wallet/CHANGELOG.md
@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.5.4-u15.0](https://github.com/Agoric/agoric/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-04-20)
+
+
+### Features
+
+* **smart-wallet:** tryExitOffer reclaims withdrawn payments ([6f01f63](6f01f63))
+
+
+### Bug Fixes
+
+* in SmartWallet, if invitation is invalid, don't process offer ([29078f7](29078f7))
+
+
+
 ### [0.5.4-u14.1](https://github.com/Agoric/agoric/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-03-12)
 
 **Note:** Version bump only for package @agoric/smart-wallet
--- c/packages/vats/CHANGELOG.md
+++ w/packages/vats/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.15.2-u15.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-04-20)
+
+
+### Features
+
+* upgrade zcf: install bundle and call updateZcfBundleId() ([74662d7](74662d7)), closes [#9250](#9250)
+
+
+
 ### [0.15.2-u14.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-03-12)
 
 **Note:** Version bump only for package @agoric/vats
--- c/packages/zoe/CHANGELOG.md
+++ w/packages/zoe/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+### [0.26.3-u15.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-04-20)
+
+
+### Bug Fixes
+
+* fix ZCF to not await in first crank ([8e289fd](8e289fd)), closes [#8911](#8911)
+
+
+
 ### [0.26.3-u14.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/[email protected]...@agoric/[email protected]) (2024-02-27)
 
 
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge:rebase Automatically rebase updates, then merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants