xs-build-lite: trigger action in dckc/agoric-sdk (WIP)

.github/workflows/ag-solo-xs.yml

@@ -18,33 +18,37 @@ jobs:
       run: yarn install
     - name: yarn build
       run: yarn build
-    - name: install moddable linux CLI SDK ag08
+    - name: install moddable linux CLI SDK v0.1.15-ag
       run: |
         cd $HOME
-        curl -L https://github.com/dckc/moddable/releases/download/ag08/moddable-linux-sdk.tgz | tar xzf -
-    - name: install tape-xs
+        curl -L https://github.com/dckc/moddable/releases/download/v0.1.15-ag/moddable-linux-sdk.tgz | tar xzf -
+    - name: install tape-xs v0.1.3
       # ISSUE: merge into agoric-sdk?
       run: |
         cd $HOME
-        curl -L https://github.com/dckc/tape-xs/archive/ag01.tar.gz | tar xzf -
-        mv tape-xs-ag01 tape-xs
+        curl -L https://github.com/dckc/tape-xs/archive/v0.1.3.tar.gz | tar xzf -
+        mv tape-xs-0.1.3 tape-xs
         cd tape-xs
         yarn install
-    - name: test eventual-send on xs
+    - name: run (most) SwingSet tests
       run: |
         export MODDABLE=$HOME/moddable
+        export WORKSPACE=$GITHUB_WORKSPACE
         export PATH=$MODDABLE/build/bin/lin/release:$PATH
         export TAPE=$HOME/tape-xs
-        cd packages/eventual-send
-        node -r esm $TAPE/bin/tape-xs-build.js $PWD test/test*.js
-        mcconfig -m -p x-cli-lin test-xs-manifest.json
-        $MODDABLE/build/bin/lin/release/eventual-send
-    - name: test marshal on xs
+        cd packages/SwingSet/test
+        make -f test-xs.mk
+    - name: build ag-solo for xs
       run: |
         export MODDABLE=$HOME/moddable
         export PATH=$MODDABLE/build/bin/lin/release:$PATH
-        export TAPE=$HOME/tape-xs
-        cd packages/marshal
-        node -r esm $TAPE/bin/tape-xs-build.js $PWD test/test*.js
-        mcconfig -m -p x-cli-lin test-xs-manifest.json
-        $MODDABLE/build/bin/lin/release/marshal
+        export WORKSPACE=$GITHUB_WORKSPACE
+        cd packages/cosmic-swingset
+        make -f ag-solo-xs.mk MODDABLE=$MODDABLE
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: packages/cosmic-swingset/bin/ag-solo-xs
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

packages/ERTP/core/escrow.js

@@ -124,10 +124,21 @@ const escrowExchange = harden({
   },
 });
 
+// generated using func2lit.js
 const escrowExchangeSrcs = harden({
-  start: `${escrowExchange.start}`,
-  checkUnits: `${escrowExchange.checkUnits}`,
-  checkPartialUnits: `${escrowExchange.checkPartialUnits}`,
+  start:
+    "(terms, inviteMaker) => {\n    const { left: moneyNeeded, right: stockNeeded } = terms;\n\n    function makeTransfer(units, srcPaymentP) {\n      const { assay } = units.label;\n      const escrowP = E(assay).claimExactly(units, srcPaymentP, 'escrow');\n      const winnings = makePromise();\n      const refund = makePromise();\n      return harden({\n        phase1() {\n          return escrowP;\n        },\n        phase2() {\n          winnings.res(escrowP);\n          refund.res(null);\n        },\n        abort(reason) {\n          winnings.reject(reason);\n          refund.res(escrowP);\n        },\n        getWinnings() {\n          return winnings.p;\n        },\n        getRefund() {\n          return refund.p;\n        },\n      });\n    }\n\n    // Promise wiring\n\n    const moneyPayment = makePromise();\n    const moneyTransfer = makeTransfer(moneyNeeded, moneyPayment.p);\n\n    const stockPayment = makePromise();\n    const stockTransfer = makeTransfer(stockNeeded, stockPayment.p);\n\n    // TODO Use cancellation tokens instead.\n    const aliceCancel = makePromise();\n    const bobCancel = makePromise();\n\n    // Set it all in motion optimistically.\n\n    const decisionP = Promise.race([\n      Promise.all([moneyTransfer.phase1(), stockTransfer.phase1()]),\n      aliceCancel.p,\n      bobCancel.p,\n    ]);\n    decisionP.then(\n      _ => {\n        moneyTransfer.phase2();\n        stockTransfer.phase2();\n      },\n      reason => {\n        moneyTransfer.abort(reason);\n        stockTransfer.abort(reason);\n      },\n    );\n\n    // Seats\n\n    const aliceSeat = harden({\n      offer: moneyPayment.res,\n      cancel: aliceCancel.reject,\n      getWinnings: stockTransfer.getWinnings,\n      getRefund: moneyTransfer.getRefund,\n    });\n\n    const bobSeat = harden({\n      offer: stockPayment.res,\n      cancel: bobCancel.reject,\n      getWinnings: moneyTransfer.getWinnings,\n      getRefund: stockTransfer.getRefund,\n    });\n\n    return harden({\n      left: inviteMaker.make('left', aliceSeat),\n      right: inviteMaker.make('right', bobSeat),\n    });\n  }",
+  checkUnits:
+    "(installation, allegedInviteUnits, expectedTerms, seat) => {\n    mustBeSameStructure(allegedInviteUnits.extent.seatDesc, seat);\n    const allegedTerms = allegedInviteUnits.extent.terms;\n    mustBeSameStructure(allegedTerms, expectedTerms, 'Escrow checkUnits');\n    mustBeSameStructure(\n      allegedInviteUnits.extent.installation,\n      installation,\n      'escrow checkUnits installation',\n    );\n    return true;\n  }",
+  checkPartialUnits:
+    "(installation, allegedInvite, expectedTerms, seat) => {\n    const allegedSeat = allegedInvite.extent.terms;\n    mustBeSameStructure(\n      allegedSeat[seat],\n      expectedTerms,\n      'Escrow checkPartialUnits seat',\n    );\n\n    mustBeSameStructure(\n      allegedInvite.extent.installation,\n      installation,\n      'escrow checkPartialUnits installation',\n    );\n\n    return seat === 'left' ? allegedSeat.right : allegedSeat.left;\n  }",
 });
 
+/* Check that the literal source is current */
+for (const name of Object.keys(escrowExchange)) {
+  if ((escrowExchangeSrcs[name] !== `${escrowExchange[name]}`, name)) {
+    console.warn('escrowExchange source out of sync:', name);
+  }
+}
+
 export { escrowExchangeSrcs };

packages/ERTP/core/func2lit.js

@@ -0,0 +1,14 @@
+async function main(argv, { stdout, requireDynamic }) {
+  const [sourceFileName, exportName] = argv.slice(2);
+  // TODO: usage
+  const ex = requireDynamic(sourceFileName);
+  await stdout.write(JSON.stringify(ex[exportName], null, 2));
+}
+
+if (typeof require === 'function' && typeof module === 'object') {
+  main(process.argv, {
+    stdout: process.stdout,
+    // eslint-disable-next-line
+    requireDynamic: require('esm')(module),
+  });
+}

packages/SwingSet/scripts/build-bundle.js

@@ -0,0 +1,64 @@
+/* eslint-disable no-await-in-loop */
+import bundleSource from '@agoric/bundle-source';
+
+async function main(argv, pkg, { open, rollup, resolvePlugin, pathResolve }) {
+  async function bundle1(startFilename, dest) {
+    console.log(`bundle: ${startFilename} -> ${dest}`);
+    const { source, sourceMap } = await bundleSource(
+      startFilename,
+      'getExport',
+      { rollup, resolvePlugin, pathResolve },
+    );
+    const actualSource = `export default ${source}\n${sourceMap}`;
+    const f = await open(dest, 'w', 0o644);
+    await f.write(actualSource);
+    await f.close();
+  }
+
+  if (argv.includes('--vats')) {
+    for (const src of argv.slice(3)) {
+      const dest = src.replace(/vat-([^.]+).js$/, 'vat_$1-src.js');
+      await bundle1(src, dest);
+    }
+  } else if (argv.length < 4) {
+    for (const dev of ['mailbox', 'command', 'timer']) {
+      const [startFilename, dest] = [
+        `${pkg}/src/devices/${dev}-src.js`,
+        `${pkg}/src/bundles/${dev}-src.js`,
+      ];
+      await bundle1(startFilename, dest);
+    }
+    for (const [vat, src] of [
+      ['vattp', 'vat-tp'],
+      ['comms', 'comms/index'],
+      ['timerWrapper', 'vat-timerWrapper'],
+    ]) {
+      const [startFilename, dest] = [
+        `${pkg}/src/vats/${src}.js`,
+        `${pkg}/src/bundles/vat_${vat}-src.js`,
+      ];
+      await bundle1(startFilename, dest);
+    }
+  } else {
+    const [startFilename, dest] = argv.slice(2, 4);
+    await bundle1(startFilename, dest);
+  }
+}
+
+/** Access ambient authority only if invoked as script. */
+/* eslint-disable global-require */
+if (typeof require !== 'undefined' && typeof module !== 'undefined') {
+  main(process.argv, `${__dirname}/..`, {
+    open: require('fs').promises.open,
+    rollup: require('rollup').rollup,
+    pathResolve: require('path').resolve,
+    resolvePlugin: require('rollup-plugin-node-resolve'),
+  }).then(
+    _ => process.exit(0),
+    err => {
+      console.log('error creating bundle:');
+      console.log(err);
+      process.exit(1);
+    },
+  );
+}

packages/SwingSet/src/controller.js

@@ -18,12 +18,23 @@ import { insistCapData } from './capdata';
 import { parseVatSlot } from './parseVatSlots';
 import { buildStorageInMemory } from './hostStorage';
 
+function byName(a, b) {
+  if (a.name < b.name) {
+    return -1;
+  }
+  if (a.name > b.name) {
+    return 1;
+  }
+  return 0;
+}
+
 export function loadBasedir(basedir) {
   console.log(`= loading config from basedir ${basedir}`);
   const vats = new Map(); // name -> { sourcepath, options }
   const subs = fs.readdirSync(basedir, { withFileTypes: true });
+  subs.sort(byName);
   subs.forEach(dirent => {
-    if (dirent.name.endsWith('~')) {
+    if (dirent.name.endsWith('~') || ['.', '..'].includes(dirent.name)) {
       return;
     }
     if (

packages/SwingSet/src/kernel-resource.js

@@ -0,0 +1,21 @@
+import harden from '@agoric/harden';
+
+// eslint-disable-next-line import/no-unresolved
+import Resource from 'moddable-sdk/files/resource/Resource';
+
+/**
+ * In the original node.js approach, the bundles/kernel module exports
+ * a function and controller coerces it to string to get its
+ * source.
+ *
+ * Here we load the kernel source from "ROM" as a Resource and
+ * convert from ESM syntax a la getExport from bundle-source.
+ */
+export default harden({
+  toString() {
+    const kernelROM = new Resource('agoric.kernel.js');
+    const kernelModText = String.fromArrayBuffer(kernelROM.slice(0));
+    const kernelExpr = kernelModText.slice('export default '.length);
+    return kernelExpr;
+  },
+});

packages/SwingSet/test/manifest.json

@@ -0,0 +1,44 @@
+{
+  "include": [
+    "$(MODDABLE)/examples/manifest_base.json",
+    "xs-compartments.json",
+  ],
+  "creation": {
+    "keys": {
+      "available": 4096
+    },
+    "stack": 4096
+  },
+  "strip": [],
+  "preload": [
+    "xs-node-global/*",
+    "main",
+    "xs_npm/tape-promise/tape"
+  ],
+  "modules": {
+    "main": "./xs-main",
+    "*": [
+      "$(MODULES)/base/timer/timer",
+      "$(MODULES)/base/timer/lin/*",
+    ],
+    "moddable-sdk/_MAKEDIR": "$(MODULES)/_MAKEDIR",
+    "moddable-sdk/files/_MAKEDIR": "$(MODULES)/files/_MAKEDIR",
+    "moddable-sdk/files/file/*": [ "$(MODULES)/files/file/*", "$(MODULES)/files/file/lin/*" ],
+    "moddable-sdk/files/resource/*": [ "$(MODULES)/files/resource/*" ],
+
+    "workspace/packages/SwingSet/src/bundles/kernel": "../src/kernel-resource",
+
+    "xs-node-global/*": "$(WORKSPACE)/packages/cosmic-swingset/lib/xs-node-global/*"
+  },
+  "data": {
+    "agoric.kernel": "../src/bundles/kernel",
+    "@agoric.mailbox-src": "../src/bundles/mailbox-src",
+    "@agoric.command-src": "../src/bundles/command-src",
+    "@agoric.timer-src": "../src/bundles/timer-src",
+    "@agoric.loopbox-src": "../src/bundles/loopbox-src",
+    "@agoric.comms": "../src/bundles/vat_comms-src",
+    "@agoric.vattp": "../src/bundles/vat_vattp-src",
+    "@agoric.vat-timerWrapper": "../src/bundles/vat_timerWrapper-src",
+    "xs-compartments": "./xs-compartments"
+  }
+}

packages/SwingSet/test/test-comms.js

@@ -1,6 +1,6 @@
 import harden from '@agoric/harden';
 import { test } from 'tape-promise/tape';
-import buildCommsDispatch from '../src/vats/comms';
+import buildCommsDispatch from '../src/vats/comms/index';
 import { flipRemoteSlot } from '../src/vats/comms/parseRemoteSlot';
 import { makeState } from '../src/vats/comms/state';
 import { addRemote } from '../src/vats/comms/remote';

packages/SwingSet/test/test-evaluate.js

@@ -1,4 +1,4 @@
-import { test } from 'tape';
+import { test } from 'tape-promise/tape';
 import evaluate from '@agoric/evaluate';
 
 test('basic', t => {