@agoric/solo 0.10.4-dev-b2bff24.0 → 0.10.4-dev-7c12b02.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/solo",
-  "version": "0.10.4-dev-b2bff24.0+b2bff24",
+  "version": "0.10.4-dev-7c12b02.0+7c12b02",
   "description": "Agoric's Solo vat runner",
   "type": "module",
   "bin": {
@@ -22,19 +22,21 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/access-token": "0.4.22-dev-b2bff24.0+b2bff24",
-    "@agoric/cache": "0.3.3-dev-b2bff24.0+b2bff24",
-    "@agoric/cosmic-swingset": "0.41.4-dev-b2bff24.0+b2bff24",
-    "@agoric/internal": "0.3.3-dev-b2bff24.0+b2bff24",
-    "@agoric/notifier": "0.6.3-dev-b2bff24.0+b2bff24",
-    "@agoric/spawner": "0.6.9-dev-b2bff24.0+b2bff24",
-    "@agoric/store": "0.9.3-dev-b2bff24.0+b2bff24",
-    "@agoric/swing-store": "0.9.2-dev-b2bff24.0+b2bff24",
-    "@agoric/swingset-vat": "0.32.3-dev-b2bff24.0+b2bff24",
-    "@agoric/telemetry": "0.6.3-dev-b2bff24.0+b2bff24",
-    "@agoric/time": "0.3.3-dev-b2bff24.0+b2bff24",
-    "@agoric/vats": "0.15.2-dev-b2bff24.0+b2bff24",
-    "@agoric/wallet": "0.18.4-dev-b2bff24.0+b2bff24",
+    "@agoric/access-token": "0.4.22-dev-7c12b02.0+7c12b02",
+    "@agoric/cache": "0.3.3-dev-7c12b02.0+7c12b02",
+    "@agoric/cosmic-proto": "0.4.1-dev-7c12b02.0+7c12b02",
+    "@agoric/cosmic-swingset": "0.41.4-dev-7c12b02.0+7c12b02",
+    "@agoric/internal": "0.3.3-dev-7c12b02.0+7c12b02",
+    "@agoric/notifier": "0.6.3-dev-7c12b02.0+7c12b02",
+    "@agoric/spawner": "0.6.9-dev-7c12b02.0+7c12b02",
+    "@agoric/store": "0.9.3-dev-7c12b02.0+7c12b02",
+    "@agoric/swing-store": "0.9.2-dev-7c12b02.0+7c12b02",
+    "@agoric/swingset-vat": "0.32.3-dev-7c12b02.0+7c12b02",
+    "@agoric/telemetry": "0.6.3-dev-7c12b02.0+7c12b02",
+    "@agoric/time": "0.3.3-dev-7c12b02.0+7c12b02",
+    "@agoric/vats": "0.15.2-dev-7c12b02.0+7c12b02",
+    "@agoric/wallet": "0.18.4-dev-7c12b02.0+7c12b02",
+    "@endo/base64": "^1.0.9",
     "@endo/captp": "^4.4.5",
     "@endo/errors": "^1.2.10",
     "@endo/eventual-send": "^1.3.1",
@@ -55,7 +57,7 @@
     "ws": "^7.2.0"
   },
   "devDependencies": {
-    "@agoric/ertp": "0.16.3-dev-b2bff24.0+b2bff24",
+    "@agoric/ertp": "0.16.3-dev-7c12b02.0+7c12b02",
     "@endo/bundle-source": "^4.0.0",
     "ava": "^5.3.0",
     "c8": "^10.1.2"
@@ -79,5 +81,5 @@
   "typeCoverage": {
     "atLeast": 74.02
   },
-  "gitHead": "b2bff2406b336cd5e1dcd865c295bae93629e6c1"
+  "gitHead": "7c12b02bef145a6d64f3e842492341f40ad8d52d"
 }

package/src/chain-cosmos-sdk.js

@@ -1,4 +1,4 @@
-/* global clearTimeout setTimeout Buffer */
+/* global clearTimeout setTimeout */
 import path from 'path';
 import fs from 'fs';
 import url from 'url';
@@ -8,15 +8,22 @@ import { open as tempOpen } from 'temp';
 import WebSocket from 'ws';
 
 import anylogger from 'anylogger';
+import { decodeBase64, encodeBase64 } from '@endo/base64';
 import { Fail, makeError } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
 
+import {
+  QueryDataRequest,
+  QueryDataResponse,
+} from '@agoric/cosmic-proto/vstorage/query.js';
+
 import { makeNotifierKit } from '@agoric/notifier';
 import {
   DEFAULT_BATCH_TIMEOUT_MS,
   makeBatchedDeliver,
 } from '@agoric/internal/src/batched-deliver.js';
 import { forever, whileTrue } from '@agoric/internal';
+import { decodeHex, encodeHex } from '@agoric/internal/src/hex.js';
 
 const console = anylogger('chain-cosmos-sdk');
 
@@ -300,7 +307,8 @@ export async function connectToChain(
       const subscribeToTxHash = (txHash, cb) => {
         const txQuery = `tm.event = 'Tx' and tx.hash = '${txHash}'`;
 
-        const b64Hash = Buffer.from(txHash, 'hex').toString('base64');
+        const bufHash = decodeHex(txHash);
+        const b64Hash = encodeBase64(bufHash);
         const txSubscriptionId = sendRPC('subscribe', { query: txQuery });
         const queryId = sendRPC('tx', { hash: b64Hash });
         const cleanup = () => {
@@ -353,7 +361,8 @@ export async function connectToChain(
         const blockSubscriptionId = sendRPC('subscribe', { query: blockQuery });
         const txSubscriptionId = sendRPC('subscribe', { query: txQuery });
         const queryId = sendRPC('abci_query', {
-          path: `/custom/swingset/storage/${storagePath}`,
+          path: `/agoric.vstorage.Query/Data`,
+          data: encodeHex(QueryDataRequest.toProto({ path: storagePath })),
         });
 
         const cleanup = () => {
@@ -380,10 +389,8 @@ export async function connectToChain(
             // Decode the layers up to the actual storage value.
             const { value: b64JsonStorage, height: heightString } =
               obj.result.response;
-            const jsonStorage = Buffer.from(b64JsonStorage, 'base64').toString(
-              'utf8',
-            );
-            const { value: storageValue } = JSON.parse(jsonStorage);
+            const buf = decodeBase64(b64JsonStorage);
+            const { value: storageValue } = QueryDataResponse.decode(buf);
             guardedCb(BigInt(heightString), storageValue);
           } else if (
             obj.result &&