Merge pull request #9116 from Agoric/ta/upstream-telescope

chore(deps): bump telescope to latest (with our patch)

packages/cosmic-proto/package.json

@@ -65,7 +65,7 @@
   "devDependencies": {
     "@agoric/cosmos": "^0.34.1",
     "@ava/typescript": "^4.1.0",
-    "@cosmology/telescope": "^1.0.1",
+    "@cosmology/telescope": "^1.5.1",
     "ava": "^5.3.1",
     "publish-scripts": "0.1.0",
     "rimraf": "^5.0.0",

packages/cosmic-proto/scripts/codegen.cjs

@@ -11,6 +11,8 @@ telescope({
   protoDirs,
   outPath,
   options: {
+    // for ESM compatibility
+    restoreImportExtension: '.js',
     tsDisable: {
       // FIXME types aren't resolving correctly
       disableAll: true,

packages/cosmic-proto/src/codegen/agoric/lien/genesis.ts

@@ -118,7 +118,7 @@ export const GenesisState = {
         e ? AccountLien.toAmino(e) : undefined,
       );
     } else {
-      obj.liens = [];
+      obj.liens = message.liens;
     }
     return obj;
   },
@@ -213,7 +213,7 @@ export const AccountLien = {
   },
   toAmino(message: AccountLien): AccountLienAmino {
     const obj: any = {};
-    obj.address = message.address;
+    obj.address = message.address === '' ? undefined : message.address;
     obj.lien = message.lien ? Lien.toAmino(message.lien) : undefined;
     return obj;
   },

packages/cosmic-proto/src/codegen/agoric/lien/lien.ts

@@ -124,14 +124,14 @@ export const Lien = {
     if (message.coins) {
       obj.coins = message.coins.map(e => (e ? Coin.toAmino(e) : undefined));
     } else {
-      obj.coins = [];
+      obj.coins = message.coins;
     }
     if (message.delegated) {
       obj.delegated = message.delegated.map(e =>
         e ? Coin.toAmino(e) : undefined,
       );
     } else {
-      obj.delegated = [];
+      obj.delegated = message.delegated;
     }
     return obj;
   },

packages/cosmic-proto/src/codegen/agoric/swingset/genesis.ts

@@ -23,7 +23,7 @@ export interface GenesisStateProtoMsg {
 export interface GenesisStateAmino {
   params?: ParamsAmino;
   state?: StateAmino;
-  swing_store_export_data?: SwingStoreExportDataEntryAmino[];
+  swing_store_export_data: SwingStoreExportDataEntryAmino[];
 }
 export interface GenesisStateAminoMsg {
   type: '/agoric.swingset.GenesisState';
@@ -173,7 +173,7 @@ export const GenesisState = {
         e ? SwingStoreExportDataEntry.toAmino(e) : undefined,
       );
     } else {
-      obj.swing_store_export_data = [];
+      obj.swing_store_export_data = message.swingStoreExportData;
     }
     return obj;
   },
@@ -269,8 +269,8 @@ export const SwingStoreExportDataEntry = {
   },
   toAmino(message: SwingStoreExportDataEntry): SwingStoreExportDataEntryAmino {
     const obj: any = {};
-    obj.key = message.key;
-    obj.value = message.value;
+    obj.key = message.key === '' ? undefined : message.key;
+    obj.value = message.value === '' ? undefined : message.value;
     return obj;
   },
   fromAminoMsg(

packages/cosmic-proto/src/codegen/agoric/swingset/msgs.ts

@@ -14,10 +14,10 @@ export interface MsgDeliverInboundProtoMsg {
 }
 /** MsgDeliverInbound defines an SDK message for delivering an eventual send */
 export interface MsgDeliverInboundAmino {
-  messages?: string[];
-  nums?: string[];
-  ack?: string;
-  submitter?: string;
+  messages: string[];
+  nums: string[];
+  ack: string;
+  submitter: string;
 }
 export interface MsgDeliverInboundAminoMsg {
   type: '/agoric.swingset.MsgDeliverInbound';
@@ -64,7 +64,7 @@ export interface MsgWalletActionProtoMsg {
  * message type is typically protected by feegrant budgets.
  */
 export interface MsgWalletActionAmino {
-  owner?: string;
+  owner: string;
   /** The action to perform, as JSON-stringified marshalled data. */
   action?: string;
 }
@@ -115,7 +115,7 @@ export interface MsgWalletSpendActionProtoMsg {
  * typically protected by explicit confirmation by the user.
  */
 export interface MsgWalletSpendActionAmino {
-  owner?: string;
+  owner: string;
   /** The action to perform, as JSON-stringified marshalled data. */
   spend_action?: string;
 }
@@ -159,10 +159,10 @@ export interface MsgProvisionProtoMsg {
 }
 /** MsgProvision defines an SDK message for provisioning a client to the chain */
 export interface MsgProvisionAmino {
-  nickname?: string;
-  address?: string;
-  power_flags?: string[];
-  submitter?: string;
+  nickname: string;
+  address: string;
+  power_flags: string[];
+  submitter: string;
 }
 export interface MsgProvisionAminoMsg {
   type: '/agoric.swingset.MsgProvision';
@@ -207,15 +207,15 @@ export interface MsgInstallBundleProtoMsg {
 }
 /** MsgInstallBundle carries a signed bundle to SwingSet. */
 export interface MsgInstallBundleAmino {
-  bundle?: string;
-  submitter?: string;
+  bundle: string;
+  submitter: string;
   /**
    * Either bundle or compressed_bundle will be set.
    * Default compression algorithm is gzip.
    */
-  compressed_bundle?: string;
+  compressed_bundle: string;
   /** Size in bytes of uncompression of compressed_bundle. */
-  uncompressed_size?: string;
+  uncompressed_size: string;
 }
 export interface MsgInstallBundleAminoMsg {
   type: '/agoric.swingset.MsgInstallBundle';
@@ -377,17 +377,15 @@ export const MsgDeliverInbound = {
     if (message.messages) {
       obj.messages = message.messages.map(e => e);
     } else {
-      obj.messages = [];
+      obj.messages = message.messages;
     }
     if (message.nums) {
       obj.nums = message.nums.map(e => e.toString());
     } else {
-      obj.nums = [];
+      obj.nums = message.nums;
     }
-    obj.ack = message.ack ? message.ack.toString() : undefined;
-    obj.submitter = message.submitter
-      ? base64FromBytes(message.submitter)
-      : undefined;
+    obj.ack = message.ack ? message.ack.toString() : '0';
+    obj.submitter = message.submitter ? base64FromBytes(message.submitter) : '';
     return obj;
   },
   fromAminoMsg(object: MsgDeliverInboundAminoMsg): MsgDeliverInbound {
@@ -554,8 +552,8 @@ export const MsgWalletAction = {
   },
   toAmino(message: MsgWalletAction): MsgWalletActionAmino {
     const obj: any = {};
-    obj.owner = message.owner ? base64FromBytes(message.owner) : undefined;
-    obj.action = message.action;
+    obj.owner = message.owner ? base64FromBytes(message.owner) : '';
+    obj.action = message.action === '' ? undefined : message.action;
     return obj;
   },
   fromAminoMsg(object: MsgWalletActionAminoMsg): MsgWalletAction {
@@ -724,8 +722,9 @@ export const MsgWalletSpendAction = {
   },
   toAmino(message: MsgWalletSpendAction): MsgWalletSpendActionAmino {
     const obj: any = {};
-    obj.owner = message.owner ? base64FromBytes(message.owner) : undefined;
-    obj.spend_action = message.spendAction;
+    obj.owner = message.owner ? base64FromBytes(message.owner) : '';
+    obj.spend_action =
+      message.spendAction === '' ? undefined : message.spendAction;
     return obj;
   },
   fromAminoMsg(object: MsgWalletSpendActionAminoMsg): MsgWalletSpendAction {
@@ -929,18 +928,14 @@ export const MsgProvision = {
   },
   toAmino(message: MsgProvision): MsgProvisionAmino {
     const obj: any = {};
-    obj.nickname = message.nickname;
-    obj.address = message.address
-      ? base64FromBytes(message.address)
-      : undefined;
+    obj.nickname = message.nickname ?? '';
+    obj.address = message.address ? base64FromBytes(message.address) : '';
     if (message.powerFlags) {
       obj.power_flags = message.powerFlags.map(e => e);
     } else {
-      obj.power_flags = [];
+      obj.power_flags = message.powerFlags;
     }
-    obj.submitter = message.submitter
-      ? base64FromBytes(message.submitter)
-      : undefined;
+    obj.submitter = message.submitter ? base64FromBytes(message.submitter) : '';
     return obj;
   },
   fromAminoMsg(object: MsgProvisionAminoMsg): MsgProvision {
@@ -1146,16 +1141,14 @@ export const MsgInstallBundle = {
   },
   toAmino(message: MsgInstallBundle): MsgInstallBundleAmino {
     const obj: any = {};
-    obj.bundle = message.bundle;
-    obj.submitter = message.submitter
-      ? base64FromBytes(message.submitter)
-      : undefined;
+    obj.bundle = message.bundle ?? '';
+    obj.submitter = message.submitter ? base64FromBytes(message.submitter) : '';
     obj.compressed_bundle = message.compressedBundle
       ? base64FromBytes(message.compressedBundle)
-      : undefined;
+      : '';
     obj.uncompressed_size = message.uncompressedSize
       ? message.uncompressedSize.toString()
-      : undefined;
+      : '0';
     return obj;
   },
   fromAminoMsg(object: MsgInstallBundleAminoMsg): MsgInstallBundle {

packages/cosmic-proto/src/codegen/agoric/swingset/query.ts

@@ -55,7 +55,7 @@ export interface QueryEgressRequestProtoMsg {
 }
 /** QueryEgressRequest is the request type for the Query/Egress RPC method */
 export interface QueryEgressRequestAmino {
-  peer?: string;
+  peer: string;
 }
 export interface QueryEgressRequestAminoMsg {
   type: '/agoric.swingset.QueryEgressRequest';
@@ -95,7 +95,7 @@ export interface QueryMailboxRequestProtoMsg {
 }
 /** QueryMailboxRequest is the mailbox query. */
 export interface QueryMailboxRequestAmino {
-  peer?: string;
+  peer: string;
 }
 export interface QueryMailboxRequestAminoMsg {
   type: '/agoric.swingset.QueryMailboxRequest';
@@ -115,7 +115,7 @@ export interface QueryMailboxResponseProtoMsg {
 }
 /** QueryMailboxResponse is the mailbox response. */
 export interface QueryMailboxResponseAmino {
-  value?: string;
+  value: string;
 }
 export interface QueryMailboxResponseAminoMsg {
   type: '/agoric.swingset.QueryMailboxResponse';
@@ -339,7 +339,7 @@ export const QueryEgressRequest = {
   },
   toAmino(message: QueryEgressRequest): QueryEgressRequestAmino {
     const obj: any = {};
-    obj.peer = message.peer ? base64FromBytes(message.peer) : undefined;
+    obj.peer = message.peer ? base64FromBytes(message.peer) : '';
     return obj;
   },
   fromAminoMsg(object: QueryEgressRequestAminoMsg): QueryEgressRequest {
@@ -508,7 +508,7 @@ export const QueryMailboxRequest = {
   },
   toAmino(message: QueryMailboxRequest): QueryMailboxRequestAmino {
     const obj: any = {};
-    obj.peer = message.peer ? base64FromBytes(message.peer) : undefined;
+    obj.peer = message.peer ? base64FromBytes(message.peer) : '';
     return obj;
   },
   fromAminoMsg(object: QueryMailboxRequestAminoMsg): QueryMailboxRequest {
@@ -588,7 +588,7 @@ export const QueryMailboxResponse = {
   },
   toAmino(message: QueryMailboxResponse): QueryMailboxResponseAmino {
     const obj: any = {};
-    obj.value = message.value;
+    obj.value = message.value ?? '';
     return obj;
   },
   fromAminoMsg(object: QueryMailboxResponseAminoMsg): QueryMailboxResponse {