agoric 0.18.4 → 0.18.5-dev-800c2bb.0

package/src/start.js

@@ -2,8 +2,10 @@
 import chalk from 'chalk';
 import { createHash } from 'crypto';
 import path from 'path';
+import { createRequire } from 'module';
 
-import { Nat, isNat } from '@agoric/nat';
+import { Nat, isNat } from '@endo/nat';
+import { untilTrue } from '@agoric/internal';
 
 import {
   CENTRAL_DENOM,
@@ -15,6 +17,8 @@ import {
 
 import { makePspawn, getSDKBinaries } from './helpers.js';
 
+const require = createRequire(import.meta.url);
+
 const terminalOnlyFlags = (...flags) => {
   if (process.stdout.isTTY && process.stdin.isTTY) {
     return flags;
@@ -27,10 +31,10 @@ const PROVISION_COINS = [
   `5000000000000000${CENTRAL_DENOM}`,
   `100provisionpass`,
   `100sendpacketpass`,
-  `1000000000000ibc/0123456789abcdef`, // IbcATOM
-  `1000000000000ibc/123456789abcdef0`, // AUSD
-  `1000000000000ibc/23456789abcdef01`,
-  `1000000000000ibc/3456789abcdef012`,
+  `1000000000000ibc/toyatom`, // ATOM
+  `1000000000000ibc/toyellie`, // AUSD
+  `1000000000000ibc/toyusdc`, // USDC
+  `1000000000000ibc/toyollie`, // USDT
 ].join(',');
 const DELEGATE0_COINS = `50000000${STAKING_DENOM}`;
 const SOLO_COINS = `13000000${STAKING_DENOM},500000000${CENTRAL_DENOM}`;
@@ -56,11 +60,11 @@ const GAS_ADJUSTMENT = '1.2';
 const delay = ms => new Promise(resolve => setTimeout(() => resolve(), ms));
 
 export default async function startMain(progname, rawArgs, powers, opts) {
-  const { anylogger, fs, spawn, process } = powers;
+  const { anylogger, fs, spawn, now, process } = powers;
   const log = anylogger('agoric:start');
 
-  const SDK_IMAGE = `agoric/agoric-sdk:${opts.dockerTag}`;
-  const SOLO_IMAGE = `agoric/cosmic-swingset-solo:${opts.dockerTag}`;
+  const SDK_IMAGE = `ghcr.io/agoric/agoric-sdk:${opts.dockerTag}`;
+  const SOLO_IMAGE = `ghcr.io/agoric/cosmic-swingset-solo:${opts.dockerTag}`;
 
   const pspawnEnv = { ...process.env };
   if (opts.verbose > 1) {
@@ -124,17 +128,17 @@ export default async function startMain(progname, rawArgs, powers, opts) {
   }
 
   const capture = (spawner, args, show = false) => {
-    const capret = [
+    const statusOut = [
       spawner(args, { stdio: ['inherit', 'pipe', 'inherit'] }),
       '',
     ];
-    capret[0].childProcess.stdout.on('data', chunk => {
+    statusOut[0].childProcess.stdout.on('data', chunk => {
       if (show) {
         process.stdout.write(chunk);
       }
-      capret[1] += chunk.toString('utf-8');
+      statusOut[1] += chunk.toString('utf-8');
     });
-    return capret;
+    return statusOut;
   };
 
   const showKey = keyName =>
@@ -176,7 +180,8 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     if (!opts.dockerTag) {
-      if (!(await exists('node_modules/@agoric/solo'))) {
+      const soloExists = await exists('node_modules/@agoric/solo');
+      if (!soloExists) {
         log.error(`you must first run '${progname} install'`);
         return 1;
       }
@@ -192,7 +197,8 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     }
 
     const fakeGCI = 'sim-chain';
-    if (!(await exists(agServer))) {
+    const serverExists = await exists(agServer);
+    if (!serverExists) {
       log(chalk.yellow(`initializing ${profileName}`));
       await pspawn(
         agSolo,
@@ -287,7 +293,8 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         );
     }
 
-    if (!(await exists(agServer))) {
+    const serverExists = await exists(agServer);
+    if (!serverExists) {
       const exitStatus = await chainSpawn([
         'init',
         'local-chain',
@@ -302,8 +309,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const addrs = {};
     for (const keyName of ['provision', 'delegate0']) {
       /* eslint-disable no-await-in-loop */
-      let capret = showKey(keyName);
-      if (await capret[0]) {
+      let statusOut = showKey(keyName);
+      const exitStatusOut = await statusOut[0];
+      if (exitStatusOut) {
         const exitStatus = await keysSpawn([
           'keys',
           'add',
@@ -313,18 +321,19 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         if (exitStatus) {
           return exitStatus;
         }
-        capret = showKey(keyName);
-        const status2 = await capret[0];
+        statusOut = showKey(keyName);
+        const status2 = await statusOut[0];
         if (status2) {
           return status2;
         }
       }
-      addrs[keyName] = capret[1].trimRight();
+      addrs[keyName] = statusOut[1].trimRight();
       /* eslint-enable no-await-in-loop */
     }
 
     const genesisFile = `${agServer}/config/genesis.json`;
-    if (!(await exists(`${genesisFile}.stamp`))) {
+    const stampExists = await exists(`${genesisFile}.stamp`);
+    if (!stampExists) {
       let exitStatus;
       exitStatus = await chainSpawn([
         'add-genesis-account',
@@ -365,7 +374,7 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       if (exitStatus) {
         return exitStatus;
       }
-      exitStatus = await fs.writeFile(`${genesisFile}.stamp`, `${Date.now()}`);
+      exitStatus = await fs.writeFile(`${genesisFile}.stamp`, `${now()}`);
       if (exitStatus) {
         return exitStatus;
       }
@@ -494,8 +503,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         );
     }
 
+    const serverExists = await exists(agServer);
     // Initialise the solo directory and key.
-    if (!(await exists(agServer))) {
+    if (!serverExists) {
       const initArgs = [`--webport=${portNum}`];
       if (opts.dockerTag) {
         initArgs.push(`--webhost=0.0.0.0`);
@@ -509,6 +519,32 @@ export default async function startMain(progname, rawArgs, powers, opts) {
         return exitStatus;
       }
     }
+
+    // Create the full economy chain config.
+    const agServerResolve = spec =>
+      require.resolve(spec, { paths: [agServer] });
+    const coreConfigPath = agServerResolve(
+      '@agoric/vats/decentral-core-config.json',
+    );
+    const economyTemplPath = agServerResolve(
+      '@agoric/cosmic-swingset/economy-template.json',
+    );
+    const [rawSoloAddr, coreConfigJson, economyTemplJson] = await Promise.all([
+      fs.readFile(`${agServer}/ag-cosmos-helper-address`, 'utf-8'),
+      fs.readFile(coreConfigPath, 'utf-8'),
+      fs.readFile(economyTemplPath, 'utf-8'),
+    ]);
+    const soloAddr = rawSoloAddr.trimRight();
+    const economyProposals = JSON.parse(
+      economyTemplJson.replace(/@PRIMARY_ADDRESS@/g, soloAddr),
+    );
+    const economyConfig = JSON.parse(coreConfigJson);
+    economyConfig.coreProposals = economyProposals;
+    await fs.writeFile(
+      `${agServer}/decentral-economy-config.json`,
+      JSON.stringify(economyConfig, null, 2),
+    );
+
     if (!opts.restart) {
       return 0;
     }
@@ -516,13 +552,13 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     const gciFile = `_agstate/agoric-servers/local-chain-${CHAIN_PORT}/config/genesis.json.sha256`;
     process.stdout.write(`Waiting for local-chain-${CHAIN_PORT} to start...`);
     let hasGci = false;
-    while (!hasGci) {
+    for await (const _ of untilTrue(() => hasGci)) {
       process.stdout.write('.');
 
       // eslint-disable-next-line no-await-in-loop
       await new Promise((resolve, reject) => {
         fs.stat(gciFile).then(
-          _ => {
+          _2 => {
             hasGci = true;
             resolve(true);
           },
@@ -551,12 +587,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
     let exitStatus;
 
     // Provision the ag-solo, if necessary.
-    const soloAddr = (
-      await fs.readFile(`${agServer}/ag-cosmos-helper-address`, 'utf-8')
-    ).trimRight();
     let bestRpcAddr;
-    while (!bestRpcAddr) {
-      for (const rpcAddr of rpcAddrs) {
+    for await (const _ of untilTrue(() => bestRpcAddr)) {
+      for await (const rpcAddr of rpcAddrs) {
         // eslint-disable-next-line no-await-in-loop
         exitStatus = await keysSpawn([
           'query',
@@ -604,12 +637,12 @@ export default async function startMain(progname, rawArgs, powers, opts) {
               SOLO_COINS,
             ],
           ];
-          for (const cmd of provCmds) {
-            const capret = capture(keysSpawn, cmd, true);
+          for (/* await */ const cmd of provCmds) {
+            const statusOut = capture(keysSpawn, cmd, true);
             // eslint-disable-next-line no-await-in-loop
-            exitStatus = await capret[0];
+            exitStatus = await statusOut[0];
             if (!exitStatus) {
-              const json = capret[1].replace(/^gas estimate: \d+$/m, '');
+              const json = statusOut[1].replace(/^gas estimate: \d+$/m, '');
               try {
                 const ret = JSON.parse(json);
                 if (ret.code !== 0) {
@@ -639,8 +672,9 @@ export default async function startMain(progname, rawArgs, powers, opts) {
       return exitStatus;
     }
 
+    const file = await fs.readFile(gciFile, 'utf-8');
     // Connect to the chain.
-    const gci = (await fs.readFile(gciFile, 'utf-8')).trimRight();
+    const gci = file.trimRight();
     exitStatus = await soloSpawn(
       ['set-gci-ingress', `--chainID=${CHAIN_ID}`, gci, bestRpcAddr],
       spawnOpts,

package/src/lib/psm.js

@@ -1,82 +0,0 @@
-// @ts-check
-
-import { COSMOS_UNIT } from './format.js';
-
-/** @typedef {import('@agoric/smart-wallet/src/offers').OfferSpec} OfferSpec */
-/** @typedef {import('@agoric/smart-wallet/src/offers').OfferStatus} OfferStatus */
-/** @typedef {import('@agoric/smart-wallet/src/smartWallet').BridgeAction} BridgeAction */
-
-/**
- * @param {Record<string, Brand>} brands
- * @param {({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
- * @param {number} [fee=0]
- * @param {string} [anchor]
- * @returns {Proposal}
- */
-export const makePSMProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
-  const giving = opts.giveMinted ? 'minted' : 'anchor';
-  const brand =
-    giving === 'anchor'
-      ? { in: brands[anchor], out: brands.IST }
-      : { in: brands.IST, out: brands[anchor] };
-  const value =
-    Number(giving === 'anchor' ? opts.wantMinted : opts.giveMinted) *
-    Number(COSMOS_UNIT);
-  const adjusted = {
-    in: BigInt(Math.ceil(giving === 'anchor' ? value / (1 - fee) : value)),
-    out: BigInt(Math.ceil(giving === 'minted' ? value * (1 - fee) : value)),
-  };
-  return {
-    give: {
-      In: { brand: brand.in, value: adjusted.in },
-    },
-    want: {
-      Out: { brand: brand.out, value: adjusted.out },
-    },
-  };
-};
-
-/**
- * @param {Instance} instance
- * @param {Record<string, Brand>} brands
- * @param {{ offerId: number, feePct?: number } &
- *         ({ wantMinted: number | undefined, giveMinted: number | undefined })} opts
- * @returns {BridgeAction}
- */
-export const makePSMSpendAction = (instance, brands, opts) => {
-  const method = opts.wantMinted
-    ? 'makeWantMintedInvitation'
-    : 'makeGiveMintedInvitation'; // ref psm.js
-  const proposal = makePSMProposal(
-    brands,
-    opts,
-    opts.feePct ? opts.feePct / 100 : undefined,
-    // @ts-expect-error please update types. Not sure where pair goees.
-    opts.pair[1],
-  );
-
-  console.warn('psm spend give', proposal.give);
-  console.warn('psm spend want', proposal.want);
-
-  // NB: not really a Proposal because the brands are not remotes
-  // Instead they're copyRecord like  "{"boardId":"board0257","iface":"Alleged: IST brand"}" to pass through the boardId
-  // fit(harden(proposal), ProposalShape);
-
-  /** @type {OfferSpec} */
-  const offer = {
-    id: opts.offerId,
-    invitationSpec: {
-      source: 'contract',
-      instance,
-      publicInvitationMaker: method,
-    },
-    proposal,
-  };
-
-  /** @type {BridgeAction} */
-  const spendAction = {
-    method: 'executeOffer',
-    offer,
-  };
-  return harden(spendAction);
-};