@agoric/orchestration 0.1.1-dev-50c9518.0 → 0.1.1-dev-d15cb41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/orchestration",
-  "version": "0.1.1-dev-50c9518.0+50c9518",
+  "version": "0.1.1-dev-d15cb41.0+d15cb41",
   "description": "Chain abstraction for Agoric's orchestration clients",
   "type": "module",
   "main": "index.js",
@@ -29,18 +29,18 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-50c9518.0+50c9518",
-    "@agoric/cosmic-proto": "0.4.1-dev-50c9518.0+50c9518",
-    "@agoric/ertp": "0.16.3-dev-50c9518.0+50c9518",
-    "@agoric/internal": "0.3.3-dev-50c9518.0+50c9518",
-    "@agoric/network": "0.1.1-dev-50c9518.0+50c9518",
-    "@agoric/notifier": "0.6.3-dev-50c9518.0+50c9518",
-    "@agoric/store": "0.9.3-dev-50c9518.0+50c9518",
-    "@agoric/time": "0.3.3-dev-50c9518.0+50c9518",
-    "@agoric/vat-data": "0.5.3-dev-50c9518.0+50c9518",
-    "@agoric/vats": "0.15.2-dev-50c9518.0+50c9518",
-    "@agoric/zoe": "0.26.3-dev-50c9518.0+50c9518",
-    "@agoric/zone": "0.2.3-dev-50c9518.0+50c9518",
+    "@agoric/assert": "0.6.1-dev-d15cb41.0+d15cb41",
+    "@agoric/cosmic-proto": "0.4.1-dev-d15cb41.0+d15cb41",
+    "@agoric/ertp": "0.16.3-dev-d15cb41.0+d15cb41",
+    "@agoric/internal": "0.3.3-dev-d15cb41.0+d15cb41",
+    "@agoric/network": "0.1.1-dev-d15cb41.0+d15cb41",
+    "@agoric/notifier": "0.6.3-dev-d15cb41.0+d15cb41",
+    "@agoric/store": "0.9.3-dev-d15cb41.0+d15cb41",
+    "@agoric/time": "0.3.3-dev-d15cb41.0+d15cb41",
+    "@agoric/vat-data": "0.5.3-dev-d15cb41.0+d15cb41",
+    "@agoric/vats": "0.15.2-dev-d15cb41.0+d15cb41",
+    "@agoric/zoe": "0.26.3-dev-d15cb41.0+d15cb41",
+    "@agoric/zone": "0.2.3-dev-d15cb41.0+d15cb41",
     "@endo/base64": "^1.0.4",
     "@endo/far": "^1.1.1",
     "@endo/marshal": "^1.4.1",
@@ -82,5 +82,5 @@
   "typeCoverage": {
     "atLeast": 96.39
   },
-  "gitHead": "50c9518a689ad12d2ae331e158cf148b02bfdcb6"
+  "gitHead": "d15cb41b5dc7d3c47a1bc4c034ae74adfc7f838a"
 }

package/src/proposals/orchestration-proposal.js

@@ -1,9 +1,7 @@
 // @ts-check
 import { V as E } from '@agoric/vat-data/vow.js';
-import { Far } from '@endo/far';
 
 /**
- * @import { AttenuatedNetwork } from '../types'
  * @import { OrchestrationService } from '../service.js'
  * @import { OrchestrationVat } from '../vat-orchestration.js'
  */
@@ -12,7 +10,7 @@ import { Far } from '@endo/far';
  * @param {BootstrapPowers & {
  *   consume: {
  *     loadCriticalVat: VatLoader<any>;
- *     networkVat: NetworkVat;
+ *     portAllocator: PortAllocator;
  *   };
  *   produce: {
  *     orchestration: Producer<any>;
@@ -29,7 +27,7 @@ import { Far } from '@endo/far';
  */
 export const setupOrchestrationVat = async (
   {
-    consume: { loadCriticalVat, networkVat },
+    consume: { loadCriticalVat, portAllocator: portAllocatorP },
     produce: {
       orchestrationVat,
       orchestration,
@@ -49,17 +47,10 @@ export const setupOrchestrationVat = async (
   orchestrationVat.reset();
   orchestrationVat.resolve(vats.orchestration);
 
-  await networkVat;
-  /** @type {AttenuatedNetwork} */
-  const network = Far('Attenuated Network', {
-    /** @param {string} localAddr */
-    async bindPort(localAddr) {
-      return E(networkVat).bindPort(localAddr);
-    },
-  });
+  const portAllocator = await portAllocatorP;
 
   const newOrchestrationKit = await E(vats.orchestration).makeOrchestration({
-    network,
+    portAllocator,
   });
 
   orchestration.reset();
@@ -88,7 +79,7 @@ export const getManifestForOrchestration = (_powers, { orchestrationRef }) => ({
     [setupOrchestrationVat.name]: {
       consume: {
         loadCriticalVat: true,
-        networkVat: true,
+        portAllocator: 'portAllocator',
       },
       produce: {
         orchestration: 'orchestration',

package/src/service.js

@@ -11,10 +11,11 @@ import { makeICAConnectionAddress, parseAddress } from './utils/address.js';
 import { makeTxPacket, parsePacketAck } from './utils/tx.js';
 
 /**
- * @import { AttenuatedNetwork, ChainAccount, ChainAddress } from './types.js';
+ * @import { ChainAccount, ChainAddress } from './types.js';
  * @import { IBCConnectionID } from '@agoric/vats';
  * @import { Zone } from '@agoric/base-zone';
  * @import { TxBody } from '@agoric/cosmic-proto/cosmos/tx/v1beta1/tx.js';
+ *
  */
 
 const { Fail, bare } = assert;
@@ -24,7 +25,7 @@ const trace = makeTracer('Orchestration');
 
 /**
  * @typedef {object} OrchestrationPowers
- * @property {ERef<AttenuatedNetwork>} network
+ * @property {ERef<PortAllocator>} portAllocator
  */
 
 /**
@@ -232,17 +233,13 @@ const prepareOrchestration = (zone, createChainAccount) =>
           powers.init(/** @type {keyof OrchestrationPowers} */ (name), power);
         }
       }
-      return { powers, icaControllerNonce: 0 };
+      return { powers };
     },
     {
       self: {
         async bindPort() {
-          const network = getPower(this.state.powers, 'network');
-          const port = await E(network).bindPort(
-            `/ibc-port/icacontroller-${this.state.icaControllerNonce}`,
-          );
-          this.state.icaControllerNonce += 1;
-          return port;
+          const portAllocator = getPower(this.state.powers, 'portAllocator');
+          return E(portAllocator).allocateICAControllerPort();
         },
       },
       public: {

package/src/types.d.ts

@@ -13,8 +13,6 @@ import type {
   UnbondingDelegation,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/staking.js';
 
-export type AttenuatedNetwork = Pick<RouterProtocol, 'bindPort'>;
-
 /**
  * static declaration of known chain types will allow type support for
  * additional chain-specific operations like `liquidStake`