7918 upgrade15 update zoe zcf #8793
Conversation
Chris-Hibbert
added
Zoe
Chris-Hibbert
force-pushed
the
tmp-upgrade-15
branch
from
910f5be to
81d2080
Compare
Chris-Hibbert
changed the base branch from
tmp-upgrade-15
to
8453-release2-Zoe
| @@ -50,6 +50,12 @@ export const makeStartInstance = ( | |||
| seatHandleToZoeSeatAdmin, | |||
| ); | |||
|
|
|||
| const getFreshZcfBundleCap = async () => { | |||
| const settledBundleCap = await getZcfBundleCapP(); | |||
| settledBundleCap !== undefined || Fail`the ZCF bundle cap was broken`; | |||
There was a problem hiding this comment.
When might settledBundleCap be undefined? What I'm wondering is if "broken" is the right diagnosis to report.
There was a problem hiding this comment.
When a fresh ZcfBundleCap is gotten, what if anything updates state.zcfBundleCap? Does getZcfBundleCapP do that? Where is getZcfBundleCapP defined anyway?
There was a problem hiding this comment.
zcfBundleCap is defined in zoe.js. It starts out undefined, and is set when setVatAdminSvc() is called. Zoe ensures that it's set early, but I think the type system can't tell, and is happier when we check and throw. "unset" might be more apt, but if it happens, I want whoever sees it to realize it's a big deal.
When a fresh ZcfBundleCap is gotten, what if anything updates state.zcfBundleCap?
Ooh! good catch! There's no state.zcfBundleCap, it's held in baggage. (We can't change what's in state in a new incarnation.) A fresh one would be set in a call to updateZcfBundleId, which does not update zoeBaggage. Created an issue: #8805.
Where is getZcfBundleCapP defined anyway?
In the call to makeStartInstance it's set to () => zcfBundleCap. (i.e. just dynamically access the local version held by Zoe.)
| zcfBundleCap = bundleCap; | ||
| }, | ||
| e => { | ||
| console.error(`'🚨 unable to update ZCF Bundle: `, e); |
There was a problem hiding this comment.
I see
What's the weird character within the literal string after the open single quote? Why is there no close single quote?
There was a problem hiding this comment.
That's (unnecessarily) a backquoted string. The singlequote within (between the backquote and flashing light) is unintentional. Since it's withing a backquoted string, it doesn't need a close quote.
I don't want to fix it only here. If you think it's worth the trouble, I will fix it first on master and then here.
| @@ -117,7 +122,7 @@ export const makeZoeStorageManager = ( | |||
| 'zoeMintBaggageSet', | |||
| ); | |||
| for (const issuerBaggage of zoeMintBaggageSet.values()) { | |||
| zoeMintBaggageSet(issuerBaggage); | |||
| prepareIssuerKit(issuerBaggage); | |||
There was a problem hiding this comment.
Surprised to see zoeMintBaggageSet become prepareIssuerKit. Digging, I see that zoeMintBaggageSet just calls provideDurableSetStore. Neither sounds like it is doing a job similar to prepareIssuerKit.
There was a problem hiding this comment.
zoeMintBaggageSet(issuerBaggage) was always a typo here. zoeMintBaggageSet is a collection. I don't know why lint didn't complain about it, but it's been fixed on master for a while.
As @warner noticed earlier today, it only didn't fail because zoeMintBaggageSet was empty till recently.
mhofman
force-pushed
the
7918-upgrade15-updateZoeZcf
branch
from
f200054 to
392fd33
Compare
mhofman
force-pushed
the
8453-release2-Zoe
branch
from
fadbaf7 to
c33d3c7
Compare
mhofman
force-pushed
the
8453-release2-Zoe
branch
from
c33d3c7 to
167b884
Compare
makeStartInstance was being passed an accessor to retrieve zcfBundleCap from zoe's state. The accessor was being called once and the result re-used rather than calling the accessor every time in case there was a new value.
mhofman
force-pushed
the
7918-upgrade15-updateZoeZcf
branch
from
392fd33 to
b33d568
Compare
refs: #7918
refs: #7918
refs: #6678
refs: #7946
Description
Add to the release branch the code to allow updating the version of ZCF to be used on contract upgrades. (#7918)
Security Considerations
N/A
Scaling Considerations
N/A
Documentation Considerations
N/A
Testing Considerations
Has been tested in swingSetTests, and in docker. Once the release branch is ready, we'll add a3p-integration tests, too.
Upgrade Considerations
Allows contract vats to be upgraded.