repair ZCF to unblock contract upgrade

[Chris-Hibbert]

closes: #9246

Description

#8911 fixes an issue with ZCF on the master branch. That issue effectively blocks contract upgrade. This ports that fix to the release branch, and adds a proposal that tells Zoe to use the new ZCF.

Security Considerations

Zoe and ZCF and the ability to upgrade contracts are crucial.

Scaling Considerations

N/A

Documentation Considerations

N/A

Testing Considerations

After installing the fix, we will test contract upgrades in a3p and the dev chains. The fix itself is tested in #8911.

Upgrade Considerations

It's all about upgrade.

[dckc]

This looks like what we discussed.

@gibson042 , I presume it's OK to duplicate rather than cherry-pick 73e0bb8 from #9250

need to double-check target branch

[dckc]

Should the target branch be dev-upgrade-15?

[mhofman]

The changes from app.go are missing. The 2 commits from #9250 should be a simple cherry pick, with the one changing app.go requiring minor conflict resolution

[Chris-Hibbert]

The changes from app.go are missing. The 2 commits from #9250 should be a simple cherry pick, with the one changing app.go requiring minor conflict resolution

attempting to cherry-pick gets

CONFLICT (file location): packages/builders/scripts/vats/upgrade-zcf.js added in 73e0bb830 (feat: add upgrade zcf only proposal) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to packages/vats/scripts/upgrade-zcf.js.
error: could not apply 73e0bb830... feat: add upgrade zcf only proposal

How would you recommend I copy that change and maintain the history? (I presume that's why a cherry pick would be preferred to a new commit)

[mhofman]

A cherry-pick does not keep the history any more than a new commit. I forgot about the move. I had split the commit to make the cherry pick easier, but that didn't help. You could indicate in the commit message what original commit was picked, but that only helps humans.

[cloudflare-pages]

Deploying agoric-sdk with    Cloudflare Pages

Latest commit:	7debf1d
Status:	🚫  Build failed.

View logs

[Chris-Hibbert]

Should the target branch be dev-upgrade-15?

Presumably that or something related. I'm waiting for a signal from @gibson042 that it's ready, at which point, I'll rebase this to it.

[gibson042]

You could indicate in the commit message what original commit was picked, but that only helps humans.

But that help is valuable! A reference to 72c7574 may very well reduce future release work.

[Chris-Hibbert]

A reference to 72c7574 may very well reduce future release work.

I think the important part of that is to note that the change to Zoe in that commit hasn't been merged to the chain yet. It should be included before the next time we're going to upgrade Zoe, or the next time we're going to upgrade multiple contracts.

[dckc]

I defer to RG / MH