@agoric/cosmic-swingset 0.41.4-dev-7ffae88.0 → 0.41.4-dev-32c4d68.0

package/Makefile

@@ -73,7 +73,7 @@ start-amm-etc: $(INTER_PROTO)/gov-amm-vaults-etc.js
 
 gov-q:
 	$(AGCH) query gov proposals --output json | \
-		jq -c '.proposals[] | [.proposal_id,.voting_end_time,.status]'
+		jq -c '.proposals[] | [if .proposal_id == null then .id else .proposal_id end,.voting_end_time,.status]'
 
 # This probably shouldn't install, but that's what published instructions
 # expect.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-7ffae88.0+7ffae88",
+  "version": "0.41.4-dev-32c4d68.0+32c4d68",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,24 +22,24 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7ffae88.0+7ffae88",
-    "@agoric/builders": "0.1.1-dev-7ffae88.0+7ffae88",
-    "@agoric/cosmos": "0.34.2-dev-7ffae88.0+7ffae88",
-    "@agoric/deploy-script-support": "0.10.4-dev-7ffae88.0+7ffae88",
-    "@agoric/internal": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/store": "0.9.3-dev-7ffae88.0+7ffae88",
-    "@agoric/swing-store": "0.9.2-dev-7ffae88.0+7ffae88",
-    "@agoric/swingset-vat": "0.32.3-dev-7ffae88.0+7ffae88",
-    "@agoric/telemetry": "0.6.3-dev-7ffae88.0+7ffae88",
-    "@agoric/vm-config": "0.1.1-dev-7ffae88.0+7ffae88",
-    "@endo/bundle-source": "^3.0.2",
-    "@endo/env-options": "^1.1.0",
-    "@endo/far": "^1.0.2",
-    "@endo/import-bundle": "^1.0.2",
-    "@endo/init": "^1.0.2",
-    "@endo/marshal": "^1.1.0",
-    "@endo/nat": "^5.0.2",
-    "@endo/promise-kit": "^1.0.2",
+    "@agoric/assert": "0.6.1-dev-32c4d68.0+32c4d68",
+    "@agoric/builders": "0.1.1-dev-32c4d68.0+32c4d68",
+    "@agoric/cosmos": "0.34.2-dev-32c4d68.0+32c4d68",
+    "@agoric/deploy-script-support": "0.10.4-dev-32c4d68.0+32c4d68",
+    "@agoric/internal": "0.3.3-dev-32c4d68.0+32c4d68",
+    "@agoric/store": "0.9.3-dev-32c4d68.0+32c4d68",
+    "@agoric/swing-store": "0.9.2-dev-32c4d68.0+32c4d68",
+    "@agoric/swingset-vat": "0.32.3-dev-32c4d68.0+32c4d68",
+    "@agoric/telemetry": "0.6.3-dev-32c4d68.0+32c4d68",
+    "@agoric/vm-config": "0.1.1-dev-32c4d68.0+32c4d68",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/env-options": "^1.1.1",
+    "@endo/far": "^1.0.4",
+    "@endo/import-bundle": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/marshal": "^1.3.0",
+    "@endo/nat": "^5.0.4",
+    "@endo/promise-kit": "^1.0.4",
     "@iarna/toml": "^2.2.3",
     "@opentelemetry/api": "~1.3.0",
     "@opentelemetry/sdk-metrics": "~1.9.0",
@@ -68,7 +68,7 @@
     "timeout": "20m"
   },
   "typeCoverage": {
-    "atLeast": 79.32
+    "atLeast": 79.84
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "32c4d68c5f675f1e8fea1a8bc08621816e7b491e"
 }

package/src/chain-main.js

@@ -30,7 +30,7 @@ import { makeShutdown } from '@agoric/internal/src/node/shutdown.js';
 
 import * as STORAGE_PATH from '@agoric/internal/src/chain-storage-paths.js';
 import * as ActionType from '@agoric/internal/src/action-types.js';
-import { BridgeId as BRIDGE_ID } from '@agoric/internal';
+import { BridgeId, CosmosInitKeyToBridgeId } from '@agoric/internal';
 import {
   makeBufferedStorage,
   makeReadCachingStorage,
@@ -53,6 +53,8 @@ let whenHellFreezesOver = null;
 
 const TELEMETRY_SERVICE_NAME = 'agd-cosmos';
 
+const PORT_SUFFIX = 'Port';
+
 const toNumber = specimen => {
   const number = parseInt(specimen, 10);
   String(number) === String(specimen) ||
@@ -319,12 +321,16 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     function doOutboundBridge(dstID, msg) {
       const portNum = portNums[dstID];
       if (portNum === undefined) {
+        const portKey =
+          Object.keys(CosmosInitKeyToBridgeId).find(
+            key => CosmosInitKeyToBridgeId[key] === dstID,
+          ) || `${dstID}${PORT_SUFFIX}`;
         console.error(
-          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${dstID}`,
+          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${portKey}`,
         );
         // it is dark, and your exception is likely to be eaten by a vat
         throw Error(
-          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${dstID}`,
+          `warning: doOutboundBridge called before AG_COSMOS_INIT gave us ${portKey}`,
         );
       }
       const respStr = chainSend(portNum, stringify(msg));
@@ -336,7 +342,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
     }
 
     const toStorage = message => {
-      return doOutboundBridge(BRIDGE_ID.STORAGE, message);
+      return doOutboundBridge(BridgeId.STORAGE, message);
     };
 
     const makeInstallationPublisher = () => {
@@ -652,24 +658,17 @@ export default async function main(progname, args, { env, homedir, agcc }) {
 
         !blockingSend || Fail`Swingset already initialized`;
 
-        if (action.swingsetPort) {
-          portNums.swingset = action.swingsetPort;
-        }
-
-        if (action.vibcPort) {
-          portNums.dibc = action.vibcPort;
-        }
-
-        if (action.storagePort) {
-          portNums.storage = action.storagePort;
-        }
-
-        if (action.vbankPort) {
-          portNums.bank = action.vbankPort;
-        }
-
-        if (action.lienPort) {
-          portNums.lien = action.lienPort;
+        for (const [key, value] of Object.entries(action)) {
+          const portAlias = CosmosInitKeyToBridgeId[key];
+          if (portAlias) {
+            // Use the alias if it exists.
+            portNums[portAlias] = value;
+          } else if (key.endsWith(PORT_SUFFIX)) {
+            // Anything else that ends in the suffix is assumed to be a port
+            // number, as described in app.go/cosmosInitAction.
+            const portName = key.slice(0, key.length - PORT_SUFFIX.length);
+            portNums[portName] = value;
+          }
         }
         harden(portNums);
 

package/src/launch-chain.js

@@ -1083,6 +1083,8 @@ export async function launch({
     controller.writeSlogObject(obj);
   }
 
+  console.info('Launched SwingSet kernel');
+
   return {
     blockingSend,
     shutdown,

package/src/params.js

@@ -29,7 +29,10 @@ export const encodeQueueSizes = queueSizes =>
     return { key, size };
   });
 
-// Map the SwingSet parameters to a deterministic data structure.
+/**
+ * Map the SwingSet parameters to a deterministic data structure.
+ * @param {import('@agoric/cosmic-proto/dist/codegen/agoric/swingset/swingset.js').ParamsSDKType} params
+ */
 export const parseParams = params => {
   const {
     beans_per_unit: rawBeansPerUnit,

package/src/sim-params.js

@@ -1,9 +1,9 @@
 // @jessie-check
+// @ts-check
 
 import { Nat } from '@endo/nat';
 
 const makeStringBeans = (key, beans) => ({ key, beans: `${Nat(beans)}` });
-const makePowerFlagFee = (powerFlag, fee) => ({ powerFlag, fee });
 const makeCoin = (denom, amount) => ({ denom, amount: `${Nat(amount)}` });
 /**
  * @param {string} key
@@ -63,8 +63,9 @@ export const defaultBeansPerUnit = [
 const defaultBootstrapVatConfig =
   '@agoric/vm-config/decentral-demo-config.json';
 
+/** @type {import('@agoric/cosmic-proto/dist/codegen/agoric/swingset/swingset.js').PowerFlagFeeSDKType[]} */
 export const defaultPowerFlagFees = [
-  makePowerFlagFee('SMART_WALLET', [makeCoin('ubld', 10_000_000n)]),
+  { power_flag: 'SMART_WALLET', fee: [makeCoin('ubld', 10_000_000n)] },
 ];
 
 export const QueueInbound = 'inbound';
@@ -75,6 +76,9 @@ export const defaultQueueMax = [
   makeQueueSize(QueueInbound, defaultInboundQueueMax),
 ];
 
+/**
+ * @type {import('@agoric/cosmic-proto/dist/codegen/agoric/swingset/swingset.js').ParamsSDKType}
+ */
 export const DEFAULT_SIM_SWINGSET_PARAMS = {
   beans_per_unit: defaultBeansPerUnit,
   fee_unit_price: defaultFeeUnitPrice,