zoe1 proposal

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
   test-proposals:
     runs-on: ubuntu-latest
     # UNTIL https://github.com/Agoric/agoric-3-proposals/issues/2
-    timeout-minutes: 90
+    timeout-minutes: 120
     steps:
       - name: free up disk space
         run: |

.gitignore

@@ -122,12 +122,15 @@ dist
 # Stores VSCode versions used for testing VSCode extensions
 .vscode-test
 
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
+# We preceed with wildcard to allow for yarn installs below root
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+**/.yarn/*
+**/!.yarn/cache
+**/!.yarn/patches
+**/!.yarn/plugins
+**/!.yarn/releases
+**/!.yarn/sdks
+**/!.yarn/versions
 
 # build in CI
 Dockerfile

buildTestImages.ts

@@ -31,6 +31,7 @@ for (const proposal of proposals) {
   const cmd = `docker buildx build --load --tag ${name} --target ${target} .`;
   console.log(cmd);
   if (!dry) {
-    execSync(cmd, { stdio: 'inherit' });
+    // `time` to output how long each build takes
+    execSync(`time ${cmd}`, { stdio: 'inherit' });
   }
 }

proposals/b:zoe1/.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

proposals/b:zoe1/README.md

@@ -0,0 +1,17 @@
+# Proposal to upgrade Zoe to incarnation 1
+
+This uses the Zoe in https://github.com/Agoric/agoric-sdk/pull/8453/
+
+It's currently a draft proposal, built from that branch with,
+
+```
+# whatever your checkout
+A3P=/opt/agoric/agoric-3-proposals
+cd packages/builders
+# build the proposal
+agoric run scripts/vats/upgrade-zoe.js | tee run-report.txt
+# copy the proposal
+cp upgrade-zoe* $A3P/proposals/b:zoe1/submission
+# copy the bundles built for the proposal
+cat run-report.txt | grep install-bundle | sed "s/agd tx swingset install-bundle @//" |xargs -I _ cp _ $A3P/proposals/b:zoe1/submission
+```

proposals/b:zoe1/config.json

@@ -0,0 +1,3 @@
+{
+    "type": "/agoric.swingset.CoreEvalProposal"
+}

proposals/b:zoe1/core-eval-support.js

@@ -0,0 +1,152 @@
+// @ts-check
+import {
+  Far,
+  makeMarshal,
+  makeTranslationTable,
+} from '../../upgrade-test-scripts/lib/unmarshal.js';
+import { Fail, NonNullish } from '../../upgrade-test-scripts/lib/assert.js';
+
+// TODO: factor out ambient authority from these
+// or at least allow caller to supply authority.
+import { mintIST } from '../../upgrade-test-scripts/lib/econHelpers.js';
+import { agoric } from '../../upgrade-test-scripts/lib/cliHelper.js';
+
+// move to unmarshal.js?
+const makeBoardUnmarshal = () => {
+  const synthesizeRemotable = (_slot, iface) =>
+    Far(iface.replace(/^Alleged: /, ''), {});
+
+  const { convertValToSlot, convertSlotToVal } = makeTranslationTable(
+    slot => Fail`unknown id: ${slot}`,
+    synthesizeRemotable,
+  );
+
+  return makeMarshal(convertValToSlot, convertSlotToVal);
+};
+
+export const getContractInfo = async (path, io = {}) => {
+  const m = makeBoardUnmarshal();
+  const {
+    agoric: { follow = agoric.follow },
+    prefix = 'published.',
+  } = io;
+  console.log('@@TODO: prevent agoric follow hang', prefix, path);
+  const txt = await follow('-lF', `:${prefix}${path}`, '-o', 'text');
+  const { body, slots } = JSON.parse(txt);
+  return m.fromCapData({ body, slots });
+};
+
+// not really core-eval related
+export const testIncludes = (t, needle, haystack, label, sense = true) => {
+  t.log(needle, sense ? 'in' : 'not in', haystack.length, label, '?');
+  const check = sense ? t.deepEqual : t.notDeepEqual;
+  if (sense) {
+    t.deepEqual(
+      haystack.filter(c => c === needle),
+      [needle],
+    );
+  } else {
+    t.deepEqual(
+      haystack.filter(c => c === needle),
+      [],
+    );
+  }
+};
+
+/**
+ * @param {Record<string, string>} record - e.g. { color: 'blue' }
+ * @returns {string[]} - e.g. ['--color', 'blue']
+ */
+export const flags = record => {
+  return Object.entries(record)
+    .map(([k, v]) => [`--${k}`, v])
+    .flat();
+};
+
+export const txAbbr = tx => {
+  const { txhash, code, height, gas_used } = tx;
+  return { txhash, code, height, gas_used };
+};
+
+export const loadedBundleIds = swingstore => {
+  const ids = swingstore`SELECT bundleID FROM bundles`.map(r => r.bundleID);
+  return ids;
+};
+
+/**
+ * @param {string} cacheFn - e.g. /home/me.agoric/cache/b1-DEADBEEF.json
+ */
+export const bundleDetail = cacheFn => {
+  const fileName = NonNullish(cacheFn.split('/').at(-1));
+  const id = fileName.replace(/\.json$/, '');
+  const hash = id.replace(/^b1-/, '');
+  return { fileName, endoZipBase64Sha512: hash, id };
+};
+
+const importBundleCost = (bytes, price = 0.002) => {
+  return bytes * price;
+};
+
+/**
+ * @typedef {{
+ *   bundles: string[],
+ *   evals: { permit: string; script: string }[],
+ * }} ProposalInfo
+ */
+
+const myISTBalance = async (agd, addr, denom = 'uist', unit = 1_000_000) => {
+  const coins = await agd.query(['bank', 'balances', addr]);
+  const coin = coins.balances.find(a => a.denom === denom);
+  return Number(coin.amount) / unit;
+};
+
+/**
+ * @param {number} myIST
+ * @param {number} cost
+ * @param {{
+ *  unit?: number, padding?: number, minInitialDebt?: number,
+ *  collateralPrice: number,
+ * }} opts
+ * @returns
+ */
+const mintCalc = (myIST, cost, opts) => {
+  const {
+    unit = 1_000_000,
+    padding = 1,
+    minInitialDebt = 6,
+    collateralPrice,
+  } = opts;
+  const { round, max } = Math;
+  const wantMinted = max(round(cost - myIST + padding), minInitialDebt);
+  const giveCollateral = round(wantMinted / collateralPrice) + 1;
+  const sendValue = round(giveCollateral * unit);
+  return { wantMinted, giveCollateral, sendValue };
+};
+
+/**
+ *
+ * @param {ReturnType<typeof import('../lib/agd-lib.js').makeAgd>} agd
+ * @param {*} config
+ * @param {number} bytes total bytes
+ * @param {{ log: (...args: any[]) => void }} io
+ * @returns
+ */
+export const ensureISTForInstall = async (agd, config, bytes, { log }) => {
+  const cost = importBundleCost(bytes);
+  log({ totalSize: bytes, cost });
+  const { installer } = config;
+  const addr = agd.lookup(installer);
+  const istBalance = await myISTBalance(agd, addr);
+
+  if (istBalance > cost) {
+    log('balance sufficient', { istBalance, cost });
+    return;
+  }
+  const { sendValue, wantMinted, giveCollateral } = mintCalc(
+    istBalance,
+    cost,
+    config,
+  );
+  log({ wantMinted });
+  await mintIST(addr, sendValue, wantMinted, giveCollateral);
+};

proposals/b:zoe1/eval.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Exit when any command fails
+set -e
+
+source /usr/src/upgrade-test-scripts/env_setup.sh
+
+ls -al
+
+npm install --global tsx
+
+./performActions.ts
+
+# let CORE_EVAL settle
+waitForBlock 5

proposals/b:zoe1/package.json

@@ -0,0 +1,15 @@
+{
+    "type": "module",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "@endo/zip": "^0.2.35",
+        "ava": "^5.3.1",
+        "better-sqlite3": "^8.5.1",
+        "execa": "^7.2.0",
+        "tmp": "^0.2.1"
+    },
+    "scripts": {
+        "agops": "yarn --cwd /usr/src/agoric-sdk/ --silent agops"
+    },
+    "packageManager": "[email protected]"
+}