base upgrade-next on top of latest (use-upgrade-14) #9204

turadg · 2024-04-06T23:08:15Z

closes: #9206

Description

With Agoric/agoric-3-proposals#141 a3p:latest now includes dev-upgrade-14 branch's upgrade handler. This removes the redundant parts from the UNRELEASED upgrade handler and its tests in a3p-integration.

It also introduces a convention initial.test.js to make clear what tests are of the post-upgrade state, to be run before tests that can modify the state. Another option is to number the tests so they run in order. I figure this can happen when needed; the test.sh allows any logic.

Security Considerations

n/a

Scaling Considerations

n/a

Documentation Considerations

no

Testing Considerations

Tests

Upgrade Considerations

Upgrade tests

:latest was bumped to include u14 by Agoric/agoric-3-proposals#141 but master can't yet apply on top of u14 #9204

turadg · 2024-04-09T00:09:52Z

failing in ./run_prepare.sh a:upgrade-next:

#23 22.49 logs: []
#23 22.49 raw_log: 'out of gas in location: WritePerByte; gasWanted: 200000, gasUsed: 204684:
#23 22.49   out of gas'

Chris-Hibbert · 2024-04-12T21:27:56Z

I'm happy to see this. I'll wait for tests to turn green before rebasing my upgrade-next work to it.

cloudflare-workers-and-pages · 2024-04-15T17:24:17Z

Deploying agoric-sdk with Cloudflare Pages

Latest commit:	`fb74bbd`
Status:	✅ Deploy successful!
Preview URL:	https://0687fd77.agoric-sdk.pages.dev
Branch Preview URL:	https://ta-use-upgrade-14.agoric-sdk.pages.dev

View logs

turadg · 2024-04-15T17:55:35Z

Gas is solved by using syntheti-chain 0.0.9.

Now it's failing on this in probeZcfBundleCap.test.js.

   23:     detailsAfter.incarnation,                               
  wf incarnation must increase by 2
  Difference (- actual, + expected):
  - 2
  + 4

@Chris-Hibbert PTAL

mhofman

Why remove the core eval submission test?

turadg · 2024-04-15T18:32:36Z

Why remove the core eval submission test?

bc I thought it was part of u14. (see test: remove upgrade-14 content from upgrade-next )

if that's not correct, please request the change or push a fixup

mhofman

Let's keep the core-eval test, it's currently the only integration test we have for #8884

mhofman · 2024-04-15T19:02:48Z

a3p-integration/proposals/a:upgrade-next/core-eval.test.js

Let's keep this test around, it's not specific to any upgrade.

Oh good point about moving it to a z:acceptance layer! I think we can have "test only" layers now?

Edit: not officially, but we can have a /agoric.swingset.CoreEvalProposal which has a eval.sh script that does nothing.

mhofman

More changes needed in the plumbing of upgrade info due to sdk 0.46 changes

a3p-integration/proposals/a:upgrade-next/package.json

Chris-Hibbert · 2024-04-16T16:39:18Z

Now it's failing on this in probeZcfBundleCap.test.js.

Yep. The test that the walletFactory upgrade was successful fails because that upgrade failed.

Stack trace

2024-04-16T16:33:40.956Z block-manager: block 1140 begin
2024-04-16T16:33:40.990Z SwingSet: vat: v1: evaluateBundleCap { manifestBundleRef: { bundleID: 'b1-2e1dc81899761c1aeefe17ab07e8475242760d9b9b0bbf35d3ac66f85cb1b06a38fbee963ba19716eb8f143c89dd8267e1d9805e577715d90a80a00ea430f0e6' }, manifestGetterName: 'getManifestForProbeZcfBundleCap', vatAdminSvc: Promise [Promise] {} }
2024-04-16T16:33:41.446Z SwingSet: vat: v1: execute { manifestGetterName: 'getManifestForProbeZcfBundleCap', bundleExports: [ 'getManifestForProbeZcfBundleCap', 'probeZcfBundleCap' ] }
2024-04-16T16:33:41.447Z SwingSet: vat: v1: coreProposal: probeZcfBundleCap
block produced
Waiting for proposal 15 to pass (status=PROPOSAL_STATUS_VOTING_PERIOD)
1
2024-04-16T16:33:43.464Z SwingSet: xsnap: v43: error during vat dispatch() of startVat,[object Object] buildRootObject unresolved
2024-04-16T16:33:43.481Z SwingSet: kernel: WARNING: vat v43 failed to upgrade from incarnation 2 (startVat)
2024-04-16T16:33:43.485Z block-manager: block 1140 commit
2024-04-16T16:33:43.546Z block-manager: block 1141 begin
2024-04-16T16:33:43.549Z SwingSet: ls: v2: Logging sent error stack (RemoteError#1)
2024-04-16T16:33:43.549Z SwingSet: ls: v2: RemoteError#1: vat-upgrade failure
2024-04-16T16:33:43.549Z SwingSet: ls: v2: Error: vat-upgrade failure
 at construct ()
 at Error (/bundled-source/.../node_modules/ses/src/error/tame-error-constructor.js:56)
 at makeError (/bundled-source/.../node_modules/ses/src/error/assert.js:243)
 at decodeErrorCommon (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:281)
 at decodeFromSmallcaps (/bundled-source/.../node_modules/@endo/marshal/src/encodeToSmallcaps.js:434)
 at map ()
 at map ()
 at fromCapData (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:356)
 at deliver (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1084)
 at dispatchToUserspace (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1509)
 at runWithoutMetering (/bundled-source/.../packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js:60)
 at ()

2024-04-16T16:33:43.550Z SwingSet: ls: v2: RemoteError#1 ERROR_NOTE: Sent as error:liveSlots:v2#70001
2024-04-16T16:33:43.551Z SwingSet: ls: v9: Logging sent error stack (RemoteError(error:liveSlots:v2#70001)#1)
2024-04-16T16:33:43.551Z SwingSet: ls: v9: RemoteError(error:liveSlots:v2#70001)#1: vat-upgrade failure
2024-04-16T16:33:43.552Z SwingSet: ls: v9: Error: vat-upgrade failure
 at construct ()
 at Error (/bundled-source/.../node_modules/ses/src/error/tame-error-constructor.js:56)
 at makeError (/bundled-source/.../node_modules/ses/src/error/assert.js:243)
 at decodeErrorCommon (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:281)
 at decodeFromSmallcaps (/bundled-source/.../node_modules/@endo/marshal/src/encodeToSmallcaps.js:434)
 at fromCapData (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:356)
 at notifyOnePromise (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1225)
 at notify (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1249)
 at dispatchToUserspace (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1514)
 at runWithoutMetering (/bundled-source/.../packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js:60)
 at ()

2024-04-16T16:33:43.552Z SwingSet: ls: v9: RemoteError(error:liveSlots:v2#70001)#1 ERROR_NOTE: Sent as error:liveSlots:v9#70001
2024-04-16T16:33:43.554Z SwingSet: vat: v1: CORE_EVAL failed: (RemoteError(error:liveSlots:v9#70001)#3)
2024-04-16T16:33:43.554Z SwingSet: vat: v1: RemoteError(error:liveSlots:v9#70001)#3: vat-upgrade failure
2024-04-16T16:33:43.554Z SwingSet: vat: v1: Error: vat-upgrade failure
 at construct ()
 at Error (/bundled-source/.../node_modules/ses/src/error/tame-error-constructor.js:56)
 at makeError (/bundled-source/.../node_modules/ses/src/error/assert.js:243)
 at decodeErrorCommon (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:281)
 at decodeFromSmallcaps (/bundled-source/.../node_modules/@endo/marshal/src/encodeToSmallcaps.js:434)
 at fromCapData (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:356)
 at notifyOnePromise (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1225)
 at notify (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1249)
 at dispatchToUserspace (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1514)
 at runWithoutMetering (/bundled-source/.../packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js:60)
 at ()

2024-04-16T16:33:43.555Z SwingSet: xsnap: v1: RemoteError(error:liveSlots:v9#70001)#3 ERROR_NOTE: Sent as error:liveSlots:v1#70001
2024-04-16T16:33:43.555Z SwingSet: ls: v1: Logging sent error stack (RemoteError(error:liveSlots:v9#70001)#3)
2024-04-16T16:33:43.556Z SwingSet: xsnap: v10: UnhandledPromiseRejectionWarning: (RemoteError(error:liveSlots:v1#70001)#4)
2024-04-16T16:33:43.556Z SwingSet: xsnap: v10: RemoteError(error:liveSlots:v1#70001)#4: vat-upgrade failure
2024-04-16T16:33:43.557Z SwingSet: xsnap: v10: Error: vat-upgrade failure
 at construct ()
 at Error (/bundled-source/.../node_modules/ses/src/error/tame-error-constructor.js:56)
 at makeError (/bundled-source/.../node_modules/ses/src/error/assert.js:243)
 at decodeErrorCommon (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:281)
 at decodeFromSmallcaps (/bundled-source/.../node_modules/@endo/marshal/src/encodeToSmallcaps.js:434)
 at fromCapData (/bundled-source/.../node_modules/@endo/marshal/src/marshal.js:356)
 at notifyOnePromise (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1225)
 at notify (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1249)
 at dispatchToUserspace (/bundled-source/.../packages/swingset-liveslots/src/liveslots.js:1514)
 at runWithoutMetering (/bundled-source/.../packages/swingset-xsnap-supervisor/lib/supervisor-subprocess-xsnap.js:60)
 at ()

I'm investigating...

authored changes addressing request

turadg

I reviewed and Approve. I opened the PR so GH won't let that count. @mhofman if you approve you can merge.

turadg · 2024-04-18T18:13:29Z

packages/deployment/Dockerfile.sdk

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1.4


what happens without this?

My docker engine won't grok --link directives without it.

See https://hub.docker.com/r/docker/dockerfile

turadg · 2024-04-18T18:14:46Z

packages/vats/src/proposals/probeZcfBundle.js

@@ -48,7 +48,9 @@ export const probeZcfBundleCap = async (
  await E(adminNode).upgrade(zoeBundleCap, {});

  // STEP 4: restart WF ////////////////////////
-  await E(walletAdminFacet).restartContract(privateArgs);
+  // Need to use `upgradeContract` instead of `restartContract`
+  // See https://github.com/Agoric/agoric-sdk/issues/9249


mhofman

Carrying @turadg approval of the final changes

initial.test.js copied from #9204

initial.test.js copied from #9204, minus checks for "network" and "localchain" vats (which on master are installed by core proposals).

initial.test.js copied from #9204, minus vats that are missing in the release-mainnet1B image.

turadg requested review from mhofman and Chris-Hibbert April 6, 2024 23:08

turadg added the automerge:rebase Automatically rebase updates, then merge label Apr 6, 2024

turadg mentioned this pull request Apr 8, 2024

bump synthetic-chain dep in u13 and u14 Agoric/agoric-3-proposals#143

Merged

turadg added a commit that referenced this pull request Apr 8, 2024

test(a3): base on use-upgrade-13 temporarily

d484d36

:latest was bumped to include u14 by Agoric/agoric-3-proposals#141 but master can't yet apply on top of u14 #9204

turadg marked this pull request as draft April 8, 2024 16:45

turadg changed the title ~~upgrade upgrade-next to be on top of use-upgrade-14~~ base upgrade-next on top of latest (use-upgrade-14) Apr 8, 2024

turadg force-pushed the ta/use-upgrade-14 branch from 8172a44 to 27827ab Compare April 8, 2024 22:46

turadg added the force:integration Force integration tests to run on PR label Apr 8, 2024

turadg mentioned this pull request Apr 9, 2024

fail the prepare step if the Software Upgrade proposal doesn't get voted in Agoric/agoric-3-proposals#144

Open

turadg removed the automerge:rebase Automatically rebase updates, then merge label Apr 10, 2024

Agoric deleted a comment from github-actions bot Apr 10, 2024

turadg force-pushed the ta/use-upgrade-14 branch from 27827ab to fcb0070 Compare April 15, 2024 17:24

mhofman reviewed Apr 15, 2024

View reviewed changes

mhofman requested changes Apr 15, 2024

View reviewed changes

turadg mentioned this pull request Apr 15, 2024

acceptance test of upgrade #8961

Open

mhofman previously requested changes Apr 15, 2024

View reviewed changes

a3p-integration/proposals/a:upgrade-next/package.json Outdated Show resolved Hide resolved

Chris-Hibbert mentioned this pull request Apr 17, 2024

in upgrade-14, Zoe doesn't record new bundleCap when contracts are upgraded #9249

Closed

dckc mentioned this pull request Apr 18, 2024

enhance smart wallet behavior when invitation creation fails #9239

Closed

dckc assigned mhofman Apr 18, 2024

turadg and others added 4 commits April 18, 2024 17:33

chore(deps): bump yarn to 4.1.1

124d803

chore(a3p-integration): update synthetic-chain to 0.0.10

6144e28

chore(a3p-integration): serial provisioning tests

9f3f00b

fix(deployment): Dockerfile syntax

92190a4

turadg and others added 4 commits April 18, 2024 17:41

test: remove upgrade-14 content from upgrade-next

efa0f90

test: upgradeInfo on top of upgrade-14

afceff3

test: vat details after upgrade

c3853dc

fix(a3p-integration): workaround zoe issues

fb74bbd

mhofman force-pushed the ta/use-upgrade-14 branch from 34327ff to fb74bbd Compare April 18, 2024 18:03

mhofman marked this pull request as ready for review April 18, 2024 18:04

mhofman requested a review from gibson042 April 18, 2024 18:04

turadg commented Apr 18, 2024

View reviewed changes

mhofman mentioned this pull request Apr 18, 2024

chore(a3p-integration): Initialize dev-upgrade-15 #9242

Merged

mhofman approved these changes Apr 18, 2024

View reviewed changes

mhofman added the automerge:rebase Automatically rebase updates, then merge label Apr 18, 2024

mhofman mentioned this pull request Apr 18, 2024

fix(smart-wallet): handling payments in case of failure to create invitation #9236

Merged

gibson042 added a commit that referenced this pull request Apr 18, 2024

ci: Test incarnation number for multiple vats

7511e7f

initial.test.js copied from #9204

mergify bot merged commit d95c80d into master Apr 18, 2024
79 of 86 checks passed

mergify bot deleted the ta/use-upgrade-14 branch April 18, 2024 18:47

gibson042 added a commit that referenced this pull request Apr 18, 2024

ci: Test incarnation number for multiple vats

5b39a30

initial.test.js copied from #9204, minus checks for "network" and "localchain" vats (which on master are installed by core proposals).

gibson042 added a commit that referenced this pull request Apr 18, 2024

ci: Test incarnation number for multiple vats

f447c44

initial.test.js copied from #9204, minus vats that are missing in the release-mainnet1B image.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

base upgrade-next on top of latest (use-upgrade-14) #9204

base upgrade-next on top of latest (use-upgrade-14) #9204

turadg commented Apr 6, 2024 •

edited

Loading

turadg commented Apr 9, 2024 •

edited

Loading

Chris-Hibbert commented Apr 12, 2024

cloudflare-workers-and-pages bot commented Apr 15, 2024 •

edited

Loading

turadg commented Apr 15, 2024

mhofman left a comment •

edited

Loading

turadg commented Apr 15, 2024

mhofman left a comment

mhofman Apr 15, 2024

mhofman Apr 15, 2024 •

edited

Loading

mhofman left a comment

Chris-Hibbert commented Apr 16, 2024

turadg left a comment •

edited

Loading

turadg Apr 18, 2024

mhofman Apr 18, 2024

mhofman Apr 18, 2024

turadg Apr 18, 2024

mhofman left a comment

base upgrade-next on top of latest (use-upgrade-14) #9204

base upgrade-next on top of latest (use-upgrade-14) #9204

Conversation

turadg commented Apr 6, 2024 • edited Loading

Description

Security Considerations

Scaling Considerations

Documentation Considerations

Testing Considerations

Upgrade Considerations

turadg commented Apr 9, 2024 • edited Loading

Chris-Hibbert commented Apr 12, 2024

cloudflare-workers-and-pages bot commented Apr 15, 2024 • edited Loading

Deploying agoric-sdk with Cloudflare Pages

turadg commented Apr 15, 2024

mhofman left a comment • edited Loading

Choose a reason for hiding this comment

turadg commented Apr 15, 2024

mhofman left a comment

Choose a reason for hiding this comment

mhofman Apr 15, 2024

Choose a reason for hiding this comment

mhofman Apr 15, 2024 • edited Loading

Choose a reason for hiding this comment

mhofman left a comment

Choose a reason for hiding this comment

Chris-Hibbert commented Apr 16, 2024

turadg left a comment • edited Loading

Choose a reason for hiding this comment

turadg Apr 18, 2024

Choose a reason for hiding this comment

mhofman Apr 18, 2024

Choose a reason for hiding this comment

mhofman Apr 18, 2024

Choose a reason for hiding this comment

turadg Apr 18, 2024

Choose a reason for hiding this comment

mhofman left a comment

Choose a reason for hiding this comment

turadg commented Apr 6, 2024 •

edited

Loading

turadg commented Apr 9, 2024 •

edited

Loading

cloudflare-workers-and-pages bot commented Apr 15, 2024 •

edited

Loading

mhofman left a comment •

edited

Loading

mhofman Apr 15, 2024 •

edited

Loading

turadg left a comment •

edited

Loading