test(zoe): Add a test for contracts surviving Zoe vat upgrade #6715

gibson042 · 2022-12-22T19:01:30Z

closes: #6713

Description

Creates a test that instantiates covered-call contracts, null-upgrades Zoe, and then finishes the contracts.

Security Considerations

n/a

Documentation Considerations

n/a

gibson042 · 2022-12-22T19:03:35Z

packages/zoe/test/swingsetTests/zoe/test-zoe-upgrade.js

+  }
+
+  // Null-upgrade Zoe.
+  const incarnationNumber = await run('upgradeVat', [zoeVatConfig]);


@Chris-Hibbert I think I will need some help after all.

Error: vat-upgrade failure

error during vat dispatch() of startVat,[object Object] (Error#1) Error#1: defineDurableKind not called for tags: [ZDEFAULT brand,ZDEFAULT payment,ZDEFAULT Purse,ZDEFAULT issuer,ZDEFAULT mint,FeeMint,Zoe Invitation brand,Zoe Invitation payment,Zoe Invitation Purse,Zoe Invitation issuer,Zoe Invitation mint,InstanceAdmin,BundleIDInstallation,BundleInstallation,InstallationStorage,ZoeMint,ZoeStorageManager,InstanceHandle,zoe Seat publisher,ZoeSeatKit,SeatHandle,instanceAdmin,zoeInstanceAdmin,emptyCreatorFacet,emptyPublicFacet,adminFacet,ZoeService,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager] Error: defineDurableKind not called for tags: [ZDEFAULT brand,ZDEFAULT payment,ZDEFAULT Purse,ZDEFAULT issuer,ZDEFAULT mint,FeeMint,Zoe Invitation brand,Zoe Invitation payment,Zoe Invitation Purse,Zoe Invitation issuer,Zoe Invitation mint,InstanceAdmin,BundleIDInstallation,BundleInstallation,InstallationStorage,ZoeMint,ZoeStorageManager,InstanceHandle,zoe Seat publisher,ZoeSeatKit,SeatHandle,instanceAdmin,zoeInstanceAdmin,emptyCreatorFacet,emptyPublicFacet,adminFacet,ZoeService,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager,InstanceStorageManager] at apply () at Error (/bundled-source/.../node_modules/ses/src/error/tame-error-constructor.js:54) at insistAllDurableKindsReconnected (/bundled-source/.../packages/SwingSet/src/liveslots/virtualObjectManager.js:994) at startVat (/bundled-source/.../packages/SwingSet/src/liveslots/liveslots.js:1437) at () at ()

Chris-Hibbert

Thanks, @gibson042, I'll take it from here for now. This is a great framework for verifying upgradeability, and I'll use it to figure out what I didn't set up correctly for upgrade.

Chris-Hibbert · 2022-12-22T21:33:15Z

packages/zoe/test/swingsetTests/upgradeCoveredCall/vat-ertp-service.js

 import { vivifyErtpService } from '@agoric/ertp/test/swingsetTests/ertpService/vat-ertp-service.js';

 export const buildRootObject = async (vatPowers, _vatParams, baggage) => {
+  const exportableAmountMath = Far('AmountMath', { ...AmountMath });


Why do we need an exportableAmountMath? AmountMath was designed to be usable locally in every vat and produce copy objects that can be sent around seamlessly.

Chris-Hibbert · 2022-12-22T21:34:02Z

packages/zoe/test/swingsetTests/zoe/test-zoe-upgrade.js

+  const messageVat = (name, methodName, args) =>
+    run('messageVat', [{ name, methodName, args }]);
+  const messageObject = (presence, methodName, args) =>
+    run('messageVatObject', [{ presence, methodName, args }]);


Are these a replacement for E() calls? What role do they play?

gibson042 · 2022-12-22T23:22:14Z

Are these a replacement for E() calls? What role do they play?

Why do we need an exportableAmountMath? AmountMath was designed to be usable locally in every vat and produce copy objects that can be sent around seamlessly.

The answer to both questions is that dependent code exists outside of the vats under test and is thus limited to pass-by-copy data as supported by encoding and decoding in packages/SwingSet/test/bootstrap-relay.js (which does use E directly).

Chris-Hibbert · 2022-12-28T23:16:19Z

@gibson042, I pushed one teensy correction. Otherwise, the test worked great! #6726 contains the changes to make Zoe pass the test. This test is now stacked on top of that.

erights · 2022-12-30T02:33:02Z

Are these two CI dapp failures due to the API change not yet being propagated to other repos? If so, why didn't they already fail in #6726 ?

Chris-Hibbert · 2022-12-30T17:12:32Z

I hadn't bothered to add the markup below to this one, since it's a known fix. Once the base PR is merged, this will get it.

#dapp-otc-branch: 5997-integration
#documentation-branch: 5997-integration

I'll add it above, and if the tests run from scratch, they'll get it.

gibson042 · 2023-01-03T18:10:14Z

The incarnationNumber change should not be necessary given the current state of upgradeVat in master, but I'm happy to let that shake out as appropriate. I'll review #6726 today.

Refactored instanceRecord storage to serve Zoe and ZCF better initialize issuerStorage only once revive feeMint, invitationIssuer on restart save bundleCap vatAdminSvc in zoe for re-use define makeInvitation inline in instanceStorageManager, so pass in InvitationIssuer vat-zoe has to define durable kinds on start & restart, but vatAdminService should be re-used on restart. This necessitated a change in the return value of makeZoeKit instanceStorageManager holds its state directly rather than lexically.

* fix: suggested simplification of 6726 * fix: more

No need for feeMintAccessRetriever. setVatAdminService is a far function also cleaned up some asserts

closes: #6748 This method shouid only ever have been accessible on ZCF.

Chris-Hibbert · 2023-01-05T23:41:24Z

I remove the cross-repo imports in the top comment. I'll rebase this on the latest #6726 to see that the tests still pass.

* Accept replacement symbols anywhere in input data structures. * Capture static vats. * Export vatAdmin and a manual timer.

Fixes #6713

Chris-Hibbert · 2023-01-13T18:19:59Z

The code this is a test for has been merged. @gibson042, please merge this.

Chris-Hibbert

LGTM

gibson042 requested a review from Chris-Hibbert December 22, 2022 19:01

gibson042 commented Dec 22, 2022

View reviewed changes

Chris-Hibbert reviewed Dec 22, 2022

View reviewed changes

Chris-Hibbert mentioned this pull request Dec 28, 2022

refactor: complete and test zoe durability #6726

Merged

Chris-Hibbert changed the base branch from master to 5997-complete-ZoeDurability December 28, 2022 23:16

Chris-Hibbert force-pushed the 5997-complete-ZoeDurability branch 2 times, most recently from 78cad8e to 45e3ed6 Compare December 29, 2022 19:10

Chris-Hibbert force-pushed the gibson-6713-test-zoe-upgrade branch from 5b6e843 to f406cc2 Compare December 29, 2022 19:42

Chris-Hibbert and others added 6 commits January 4, 2023 17:40

chore: cleanup: renaming and dropping unused types

606d8ed

chore: handle promised vatAdminSvc, more zoeService initializations

e4ab25e

fix: suggested simplification of 6726 (#6735)

87953fe

* fix: suggested simplification of 6726 * fix: more

refactor: makeZoeKit() returns(zoe,feeMintAccess,setVatAdminService}

34984f3

No need for feeMintAccessRetriever. setVatAdminService is a far function also cleaned up some asserts

fix: drop setOfferFilter() from Zoe and ZoeStorageManager

8f63d8c

closes: #6748 This method shouid only ever have been accessible on ZCF.

Chris-Hibbert force-pushed the 5997-complete-ZoeDurability branch from 5e69166 to 8f63d8c Compare January 5, 2023 01:50

chore: fix zoeService; simplify fitGetTerms; change error msgs

3c042d8

gibson042 and others added 5 commits January 5, 2023 15:44

test(zoe): Clean up upgradeCoveredCall tests

08afbb7

test(SwingSet): Enhance the bootstrap-relay vat

8f027b7

* Accept replacement symbols anywhere in input data structures. * Capture static vats. * Export vatAdmin and a manual timer.

test(zoe): Export AmountMath from the ERTP vat

db292fd

test(zoe): Add a test for contracts surviving Zoe vat upgrade

eda8ffc

Fixes #6713

fix: minor fix to zoe durability test

cae7bcc

Chris-Hibbert force-pushed the gibson-6713-test-zoe-upgrade branch from f406cc2 to cae7bcc Compare January 5, 2023 23:46

Base automatically changed from 5997-complete-ZoeDurability to master January 13, 2023 18:15

Chris-Hibbert added Zoe package: Zoe automerge:squash Automatically squash merge labels Jan 13, 2023

Chris-Hibbert approved these changes Jan 13, 2023

View reviewed changes

Merge branch 'master' into gibson-6713-test-zoe-upgrade

99fe0fc

mergify bot merged commit 876c738 into master Jan 13, 2023

mergify bot deleted the gibson-6713-test-zoe-upgrade branch January 13, 2023 20:05

Chris-Hibbert mentioned this pull request Jan 14, 2023

5285 durable publishkits #6783

Merged

dckc mentioned this pull request Jan 25, 2023

make vat-bank upgradeable #6849

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test(zoe): Add a test for contracts surviving Zoe vat upgrade #6715

test(zoe): Add a test for contracts surviving Zoe vat upgrade #6715

gibson042 commented Dec 22, 2022 •

edited by Chris-Hibbert

Loading

gibson042 Dec 22, 2022

Chris-Hibbert left a comment

Chris-Hibbert Dec 22, 2022

Chris-Hibbert Dec 22, 2022

gibson042 commented Dec 22, 2022

Chris-Hibbert commented Dec 28, 2022

erights commented Dec 30, 2022

Chris-Hibbert commented Dec 30, 2022

gibson042 commented Jan 3, 2023

Chris-Hibbert commented Jan 5, 2023

Chris-Hibbert commented Jan 13, 2023

Chris-Hibbert left a comment

test(zoe): Add a test for contracts surviving Zoe vat upgrade #6715

test(zoe): Add a test for contracts surviving Zoe vat upgrade #6715

Conversation

gibson042 commented Dec 22, 2022 • edited by Chris-Hibbert Loading

Description

Security Considerations

Documentation Considerations

gibson042 Dec 22, 2022

Choose a reason for hiding this comment

Chris-Hibbert left a comment

Choose a reason for hiding this comment

Chris-Hibbert Dec 22, 2022

Choose a reason for hiding this comment

Chris-Hibbert Dec 22, 2022

Choose a reason for hiding this comment

gibson042 commented Dec 22, 2022

Chris-Hibbert commented Dec 28, 2022

erights commented Dec 30, 2022

Chris-Hibbert commented Dec 30, 2022

gibson042 commented Jan 3, 2023

Chris-Hibbert commented Jan 5, 2023

Chris-Hibbert commented Jan 13, 2023

Chris-Hibbert left a comment

Choose a reason for hiding this comment

gibson042 commented Dec 22, 2022 •

edited by Chris-Hibbert

Loading