@agoric/orchestration 0.1.1-dev-84de950.0 → 0.1.1-dev-4c65fc2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-84de950.0+84de950",
+  "version": "0.1.1-dev-4c65fc2.0+4c65fc2",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -29,17 +29,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-84de950.0+84de950",
-    "@agoric/cosmic-proto": "0.4.1-dev-84de950.0+84de950",
-    "@agoric/ertp": "0.16.3-dev-84de950.0+84de950",
-    "@agoric/internal": "0.3.3-dev-84de950.0+84de950",
-    "@agoric/network": "0.1.1-dev-84de950.0+84de950",
-    "@agoric/notifier": "0.6.3-dev-84de950.0+84de950",
-    "@agoric/store": "0.9.3-dev-84de950.0+84de950",
-    "@agoric/vat-data": "0.5.3-dev-84de950.0+84de950",
-    "@agoric/vats": "0.15.2-dev-84de950.0+84de950",
-    "@agoric/zoe": "0.26.3-dev-84de950.0+84de950",
-    "@agoric/zone": "0.2.3-dev-84de950.0+84de950",
+    "@agoric/assert": "0.6.1-dev-4c65fc2.0+4c65fc2",
+    "@agoric/cosmic-proto": "0.4.1-dev-4c65fc2.0+4c65fc2",
+    "@agoric/ertp": "0.16.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/internal": "0.3.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/network": "0.1.1-dev-4c65fc2.0+4c65fc2",
+    "@agoric/notifier": "0.6.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/store": "0.9.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/vat-data": "0.5.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/vats": "0.15.2-dev-4c65fc2.0+4c65fc2",
+    "@agoric/zoe": "0.26.3-dev-4c65fc2.0+4c65fc2",
+    "@agoric/zone": "0.2.3-dev-4c65fc2.0+4c65fc2",
     "@endo/base64": "^1.0.4",
     "@endo/far": "^1.1.1",
     "@endo/marshal": "^1.4.1",
@@ -49,8 +49,7 @@
     "@cosmjs/amino": "^0.32.3",
     "@cosmjs/proto-signing": "^0.32.3",
     "@endo/ses-ava": "^1.2.1",
-    "ava": "^5.3.1",
-    "cosmjs-types": "^0.9.0"
+    "ava": "^5.3.1"
   },
   "ava": {
     "extensions": {
@@ -82,5 +81,5 @@
   "typeCoverage": {
     "atLeast": 96.39
   },
-  "gitHead": "84de950e98dd32588616e38f63d97a72a440b134"
+  "gitHead": "4c65fc27a3e151be82ad228d58a7610d51b3c4a2"
 }

package/src/contracts/stakingAccountHolder.js

@@ -11,12 +11,13 @@ import { M, prepareExoClassKit } from '@agoric/vat-data';
 import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js';
 import { decodeBase64 } from '@endo/base64';
 import { E } from '@endo/far';
-import { txToBase64 } from '../utils/tx.js';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
 
 /**
  * @import { ChainAccount, ChainAddress } from '../types.js';
  * @import { RecorderKit, MakeRecorderKit } from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import { Baggage } from '@agoric/swingset-liveslots';
+ * @import {AnyJson} from '@agoric/cosmic-proto';
  */
 
 const trace = makeTracer('StakingAccountHolder');
@@ -109,12 +110,14 @@ export const prepareStakingAccountHolder = (baggage, makeRecorderKit, zcf) => {
           const delegatorAddress = this.state.chainAddress;
 
           const result = await E(account).executeEncodedTx([
-            txToBase64(
-              MsgDelegate.toProtoMsg({
-                delegatorAddress,
-                validatorAddress,
-                amount,
-              }),
+            /** @type {AnyJson} */ (
+              Any.toJSON(
+                MsgDelegate.toProtoMsg({
+                  delegatorAddress,
+                  validatorAddress,
+                  amount,
+                }),
+              )
             ),
           ]);
 

package/src/orchestration.js

@@ -18,7 +18,7 @@ import '@agoric/network/exported.js';
 const { Fail, bare } = assert;
 const trace = makeTracer('Orchestration');
 
-/** @import {Proto3Msg} from './utils/tx.js'; */
+/** @import {AnyJson} from '@agoric/cosmic-proto'; */
 
 // TODO improve me
 /** @typedef {string} ChainAddress */
@@ -124,7 +124,7 @@ const prepareChainAccount = zone =>
           return this.state.port;
         },
         /**
-         * @param {Proto3Msg[]} msgs
+         * @param {AnyJson[]} msgs
          * @param {Omit<TxBody, 'messages'>} [opts]
          * @returns {Promise<string>} - base64 encoded bytes string. Can be decoded using the corresponding `Msg*Response` object.
          * @throws {Error} if packet fails to send or an error is returned

package/src/utils/tx.js

@@ -1,24 +1,20 @@
 // @ts-check
 import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
-import { decodeBase64, encodeBase64 } from '@endo/base64';
-
-/** @typedef {{ typeUrl: string; value: string; }} Proto3Msg */
+import { encodeBase64 } from '@endo/base64';
+import { Any } from '@agoric/cosmic-proto/google/protobuf/any';
 
 /**
  * Makes an IBC packet from an array of messages. Expects the `value` of each message
  * to be base64 encoded bytes.
  * Skips checks for malformed messages in favor of interface guards.
- * @param {Proto3Msg[]} msgs
+ * @param {import('@agoric/cosmic-proto').AnyJson[]} msgs
  * // XXX intellisense does not seem to infer well here
  * @param {Omit<TxBody, 'messages'>} [opts]
  * @returns {string} - IBC TX packet
  * @throws {Error} if malformed messages are provided
  */
 export function makeTxPacket(msgs, opts) {
-  const messages = msgs.map(msg => ({
-    typeUrl: msg.typeUrl,
-    value: decodeBase64(msg.value),
-  }));
+  const messages = msgs.map(Any.fromJSON);
   const bytes = TxBody.encode(
     TxBody.fromPartial({
       messages,
@@ -34,19 +30,6 @@ export function makeTxPacket(msgs, opts) {
 }
 harden(makeTxPacket);
 
-/**
- * base64 encode an EncodeObject for cross-vat communication
- * @param {{ typeUrl: string, value: Uint8Array }} tx
- * @returns {Proto3Msg}
- */
-export function txToBase64(tx) {
-  return {
-    typeUrl: tx.typeUrl,
-    value: encodeBase64(tx.value),
-  };
-}
-harden(txToBase64);
-
 /**
  * Looks for a result or error key in the response string, and returns
  * a Base64Bytes string. This string can be decoded using the corresponding