fix: better ocap discipline

Agoric · Feb 24, 2021 · eef6540 · eef6540
1 parent fcf93ad
commit eef6540
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/cosmic-swingset/lib/chain-entrypoint.js b/packages/cosmic-swingset/lib/chain-entrypoint.js
@@ -12,6 +12,7 @@ const agcc = require('@agoric/cosmos');
 esmRequire('@agoric/install-metering-and-ses');
 
 const path = require('path');
+const os = require('os');
 
 esmRequire('./anylogger-agoric');
 const anylogger = require('anylogger');
@@ -22,6 +23,7 @@ const main = esmRequire('./chain-main.js').default;
 
 main(process.argv[1], process.argv.splice(2), {
   path,
+  homedir: os.homedir(),
   env: process.env,
   agcc,
 }).then(

diff --git a/packages/cosmic-swingset/lib/chain-main.js b/packages/cosmic-swingset/lib/chain-main.js
@@ -5,7 +5,6 @@ import {
 } from '@agoric/swingset-vat/src/devices/mailbox';
 
 import { assert, details as X } from '@agoric/assert';
-import os from 'os';
 
 import { launch } from './launch-chain';
 import makeBlockManager from './block-manager';
@@ -77,7 +76,11 @@ const makeChainStorage = (call, prefix = '', imp = x => x, exp = x => x) => {
   return storage;
 };
 
-export default async function main(progname, args, { path, env, agcc }) {
+export default async function main(
+  progname,
+  args,
+  { path, env, homedir, agcc },
+) {
   const portNums = {};
 
   // TODO: use the 'basedir' pattern
@@ -105,7 +108,7 @@ export default async function main(progname, args, { path, env, agcc }) {
 
   // We try to find the actual cosmos state directory (default=~/.ag-chain-cosmos), which
   // is better than scribbling into the current directory.
-  const cosmosHome = getFlagValue('home', `${os.homedir()}/.ag-chain-cosmos`);
+  const cosmosHome = getFlagValue('home', `${homedir}/.ag-chain-cosmos`);
   const stateDBDir = `${cosmosHome}/data/ag-cosmos-chain-state`;
 
   // console.log('Have AG_COSMOS', agcc);
@@ -223,9 +226,9 @@ export default async function main(progname, args, { path, env, agcc }) {
     const vatsdir = path.resolve(__dirname, '../lib/ag-solo/vats');
     const argv = {
       ROLE: 'chain',
-      noFakeCurrencies: process.env.NO_FAKE_CURRENCIES,
+      noFakeCurrencies: env.NO_FAKE_CURRENCIES,
     };
-    const meterProvider = getMeterProvider(console, process.env);
+    const meterProvider = getMeterProvider(console, env);
     const s = await launch(
       stateDBDir,
       mailboxStorage,