@agoric/solo 0.10.4-dev-c073e81.0.c073e81 → 0.10.4-dev-bee326c.0.bee326c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.10.4-dev-c073e81.0.c073e81",
+  "version": "0.10.4-dev-bee326c.0.bee326c",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -22,20 +22,20 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-c073e81.0.c073e81",
-    "@agoric/cache": "0.3.3-dev-c073e81.0.c073e81",
-    "@agoric/cosmic-proto": "0.4.1-dev-c073e81.0.c073e81",
-    "@agoric/cosmic-swingset": "0.41.4-dev-c073e81.0.c073e81",
-    "@agoric/internal": "0.3.3-dev-c073e81.0.c073e81",
-    "@agoric/notifier": "0.6.3-dev-c073e81.0.c073e81",
-    "@agoric/spawner": "0.6.9-dev-c073e81.0.c073e81",
-    "@agoric/store": "0.9.3-dev-c073e81.0.c073e81",
-    "@agoric/swing-store": "0.9.2-dev-c073e81.0.c073e81",
-    "@agoric/swingset-vat": "0.32.3-dev-c073e81.0.c073e81",
-    "@agoric/telemetry": "0.6.3-dev-c073e81.0.c073e81",
-    "@agoric/time": "0.3.3-dev-c073e81.0.c073e81",
-    "@agoric/vats": "0.15.2-dev-c073e81.0.c073e81",
-    "@agoric/wallet": "0.18.4-dev-c073e81.0.c073e81",
+    "@agoric/access-token": "0.4.22-dev-bee326c.0.bee326c",
+    "@agoric/cache": "0.3.3-dev-bee326c.0.bee326c",
+    "@agoric/cosmic-proto": "0.4.1-dev-bee326c.0.bee326c",
+    "@agoric/cosmic-swingset": "0.41.4-dev-bee326c.0.bee326c",
+    "@agoric/internal": "0.3.3-dev-bee326c.0.bee326c",
+    "@agoric/notifier": "0.6.3-dev-bee326c.0.bee326c",
+    "@agoric/spawner": "0.6.9-dev-bee326c.0.bee326c",
+    "@agoric/store": "0.9.3-dev-bee326c.0.bee326c",
+    "@agoric/swing-store": "0.9.2-dev-bee326c.0.bee326c",
+    "@agoric/swingset-vat": "0.32.3-dev-bee326c.0.bee326c",
+    "@agoric/telemetry": "0.6.3-dev-bee326c.0.bee326c",
+    "@agoric/time": "0.3.3-dev-bee326c.0.bee326c",
+    "@agoric/vats": "0.15.2-dev-bee326c.0.bee326c",
+    "@agoric/wallet": "0.18.4-dev-bee326c.0.bee326c",
     "@endo/base64": "^1.0.12",
     "@endo/captp": "^4.4.8",
     "@endo/errors": "^1.2.13",
@@ -56,7 +56,7 @@
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "0.16.3-dev-c073e81.0.c073e81",
+    "@agoric/ertp": "0.16.3-dev-bee326c.0.bee326c",
     "@endo/bundle-source": "^4.1.2",
     "ava": "^5.3.0",
     "c8": "^10.1.3"
@@ -80,5 +80,5 @@
   "typeCoverage": {
     "atLeast": 73.92
   },
-  "gitHead": "c073e811260c21c5322196dcfe7ff5bcbcd2f37a"
+  "gitHead": "bee326c8bea470c3762ed34f41a9b0b112832b89"
 }

package/src/chain-cosmos-sdk.js

@@ -200,18 +200,16 @@ export async function connectToChain(
 
   let goodRpcHref = rpcHrefs[0];
   const runHelper = (args, stdin = undefined) => {
-    const fullArgs = [
-      ...args,
-      `--chain-id=${chainID}`,
-      `--node=${goodRpcHref}`,
-      `--home=${helperDir}`,
-    ];
+    const fullArgs = [...args, `--node=${goodRpcHref}`, `--home=${helperDir}`];
     console.debug(HELPER, ...fullArgs);
     return new Promise(resolve => {
       const proc = execFile(
         HELPER,
         fullArgs,
-        { maxBuffer: MAX_BUFFER_SIZE },
+        {
+          maxBuffer: MAX_BUFFER_SIZE,
+          env: { ...process.env, AGD_CHAIN_ID: chainID },
+        },
         (_error, stdout, stderr) => {
           resolve({ stdout, stderr });
         },
@@ -305,7 +303,7 @@ export async function connectToChain(
       };
 
       const subscribeToTxHash = (txHash, cb) => {
-        const txQuery = `tm.event = 'Tx' and tx.hash = '${txHash}'`;
+        const txQuery = `tm.event = 'Tx' AND tx.hash = '${txHash}'`;
 
         const bufHash = decodeHex(txHash);
         const b64Hash = encodeBase64(bufHash);
@@ -328,7 +326,7 @@ export async function connectToChain(
             cb(obj.error);
             return;
           }
-          if (!obj.result) {
+          if (!obj.result || Object.keys(obj.result).length === 0) {
             return;
           }
           let txResult;
@@ -355,7 +353,7 @@ export async function connectToChain(
         // This takes care of BeginBlock/EndBlock events.
         const blockQuery = `tm.event = 'NewBlockHeader' AND storage.path = '${storagePath}'`;
         // We need a separate query for events raised by transactions.
-        const txQuery = `tm.event = 'Tx' and storage.path = '${storagePath}'`;
+        const txQuery = `tm.event = 'Tx' AND storage.path = '${storagePath}'`;
 
         // console.info('subscribeToStorage', blockQuery);
         const blockSubscriptionId = sendRPC('subscribe', { query: blockQuery });
@@ -385,18 +383,14 @@ export async function connectToChain(
         // Query for our initial value.
         setCallback(queryId, obj => {
           // console.info(`got ${storagePath} query`, obj);
-          if (obj.result && obj.result.response && obj.result.response.value) {
+          if (obj.result?.response?.value) {
             // Decode the layers up to the actual storage value.
             const { value: b64JsonStorage, height: heightString } =
               obj.result.response;
             const buf = decodeBase64(b64JsonStorage);
             const { value: storageValue } = QueryDataResponse.decode(buf);
             guardedCb(BigInt(heightString), storageValue);
-          } else if (
-            obj.result &&
-            obj.result.response &&
-            obj.result.response.code === 6
-          ) {
+          } else if (obj.result?.response?.code === 6) {
             // No need to try again, just a missing value that our subscription
             // will pick up.
             const { height: heightString } = obj.result.response;