Merge branch 'master' into iomekam-es-lint-2

a3p-integration/proposals/f:fast-usdc/.gitignore

@@ -0,0 +1 @@
+add-operators

a3p-integration/proposals/f:fast-usdc/deploy.test.js

@@ -2,19 +2,14 @@
 /* eslint-env node */
 import test from 'ava';
 import '@endo/init/legacy.js'; // axios compat
-import { makeSmartWalletKit } from '@agoric/client-utils';
+import { LOCAL_CONFIG, makeSmartWalletKit } from '@agoric/client-utils';
 
 const io = {
   delay: ms => new Promise(resolve => setTimeout(() => resolve(undefined), ms)),
   fetch: global.fetch,
 };
-const networkConfig = {
-  rpcAddrs: ['http://0.0.0.0:26657'],
-  chainName: 'agoriclocal',
-};
-
 test('fastUsdc is in agoricNames.instance', async t => {
-  const { agoricNames } = await makeSmartWalletKit(io, networkConfig);
+  const { agoricNames } = await makeSmartWalletKit(io, LOCAL_CONFIG);
 
   t.log('agoricNames.instance keys', Object.keys(agoricNames.instance));
   t.truthy(agoricNames.instance.fastUsdc);

a3p-integration/proposals/f:fast-usdc/operators.test.js

@@ -0,0 +1,78 @@
+/* eslint-env node */
+import unknownTest from 'ava';
+
+import '@endo/init/legacy.js'; // axios compat
+
+import { LOCAL_CONFIG, makeVstorageKit } from '@agoric/client-utils';
+import { evalBundles, waitForBlock } from '@agoric/synthetic-chain';
+
+// XXX ~copied to not take a dependency on Zoe
+/**
+ * @typedef {object} InvitationDetails
+ * @property {unknown} installation
+ * @property {unknown} instance
+ * @property {InvitationHandle} handle
+ * @property {string} description
+ * @property {Record<string, any>} [customDetails]
+ */
+
+/**
+ * @import {VstorageKit} from '@agoric/client-utils';
+ */
+
+const test = /** @type {import('ava').TestFn<{ vstorageKit: VstorageKit}>} */ (
+  unknownTest
+);
+
+const ADD_OPERATORS_DIR = 'add-operators';
+
+/**
+ * @typedef {import('@agoric/ertp').NatAmount} NatAmount
+ * @typedef {{
+ *   allocations: { Fee: NatAmount, USD_LEMONS: NatAmount },
+ *  }} ReserveAllocations
+ */
+
+test.before(async t => {
+  const vstorageKit = makeVstorageKit({ fetch }, LOCAL_CONFIG);
+
+  t.context = {
+    vstorageKit,
+  };
+});
+
+test.serial('add operators', async t => {
+  const { vstorageKit } = t.context;
+
+  const walletPath =
+    // account mem3 in test of crabble-start proposal (64)
+    // This must match the oracleNew value in the add-operators builder argument
+    'wallet.agoric1hmdue96vs0p6zj42aa26x6zrqlythpxnvgsgpr.current';
+
+  const readInvitationsPurseBalance = async () => {
+    const curr = await vstorageKit.readPublished(walletPath);
+    return /** @type {InvitationDetails[]} */ (curr.purses[0].balance.value);
+  };
+
+  let numInvitationsBefore = 0;
+  {
+    const invBalance = await readInvitationsPurseBalance();
+    numInvitationsBefore = invBalance.length;
+    t.false(
+      invBalance.some(inv => inv.description === 'oracle operator invitation'),
+    );
+  }
+
+  await evalBundles(ADD_OPERATORS_DIR);
+  // give time for the invitations to be deposited
+  await waitForBlock(5);
+
+  {
+    const invBalance = await readInvitationsPurseBalance();
+    console.log('after', invBalance);
+    t.is(invBalance.length, numInvitationsBefore + 1);
+    t.true(
+      invBalance.some(inv => inv.description === 'oracle operator invitation'),
+    );
+  }
+});

a3p-integration/proposals/f:fast-usdc/package.json

@@ -2,7 +2,8 @@
   "agoricProposal": {
     "source": "subdir",
     "sdk-generate": [
-      "fast-usdc/init-fast-usdc.js submission --net A3P_INTEGRATION --noNoble"
+      "fast-usdc/start-fast-usdc.build.js submission --net A3P_INTEGRATION --noNoble",
+      "fast-usdc/add-operators.build.js add-operators --oracle oracleNew:agoric1hmdue96vs0p6zj42aa26x6zrqlythpxnvgsgpr"
     ],
     "type": "/agoric.swingset.CoreEvalProposal"
   },

a3p-integration/proposals/f:fast-usdc/test.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+echo AVAILABLE WALLETs
+agd query vstorage children published.wallet
+
 yarn ava
 
 ./test-cli.sh