Merge pull request #8682 from Agoric/8672-acyclicZoeSeatKit

refactor ZoeSeat to drop cyclic structure that blocked GC
Agoric · Mar 1, 2024 · 7a91d1f · 7a91d1f
2 parents f33b371 + 5d5722f
commit 7a91d1f
Show file tree

Hide file tree

Showing 9 changed files with 582 additions and 116 deletions.
diff --git a/a3p-integration/README.md b/a3p-integration/README.md
@@ -102,9 +102,9 @@ code, and must be rebuilt every time there is a change. The
 `/scripts/generate-a3p-submission.sh` script contains commands to generate the
 core-eval content and move it to the expected proposal package's submission
 directory. It is executed as part of `a3p-integration`'s `build:submission` step.
-Each proposal that requires such a build step should add a `submission` entry in
-the `agoricProposal` section of package.json. This value specifies the name of
-another entry which gives parameters to be passed to `generate-a3p-submission.sh`.
+Each proposal that requires such a build step should add a `build:submission`
+rule in its  package.json to specify the details of proposals that require a
+build step.
 
 ## Building synthetic-chain images
 

diff --git a/a3p-integration/proposals/a:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-next/package.json
@@ -24,7 +24,8 @@
     ]
   },
   "scripts": {
-    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
+    "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops",
+    "build:submission": "../../../scripts/generate-a3p-submission.sh probe-zcf-bundle a:upgrade-next probeZcfBundle probe-submission"
   },
   "packageManager": "[email protected]"
 }
diff --git a/a3p-integration/proposals/b:localchain/package.json b/a3p-integration/proposals/b:localchain/package.json
@@ -17,5 +17,8 @@
       "!submission"
     ]
   },
+  "scripts": {
+    "build:submission": "../../../scripts/generate-a3p-submission.sh test-localchain b:localchain"
+  },
   "packageManager": "[email protected]"
 }
diff --git a/packages/zoe/src/contractFacet/exit.js b/packages/zoe/src/contractFacet/exit.js
@@ -35,6 +35,7 @@ export const makeMakeExiter = baggage => {
       exit() {
         const { state } = this;
         state.zcfSeat.exit();
+        state.zcfSeat = undefined;
       },
     },
     {

diff --git a/packages/zoe/src/contractFacet/zcfSeat.js b/packages/zoe/src/contractFacet/zcfSeat.js
@@ -159,6 +159,7 @@ export const createSeatManager = (
         assertNoStagedAllocation(self);
         doExitSeat(self);
         E(zoeInstanceAdmin).exitSeat(zcfSeatToSeatHandle.get(self), completion);
+        zcfSeatToSeatHandle.delete(self);
       },
       fail(
         reason = Error(
@@ -179,6 +180,7 @@ export const createSeatManager = (
             zcfSeatToSeatHandle.get(self),
             harden(reason),
           );
+          zcfSeatToSeatHandle.delete(self);
         }
         return reason;
       },