feat!: remove orch.makeLocalAccount

- closes: #10106
Agoric · Oct 15, 2024 · d567331 · d567331
1 parent 9883fcf
commit d567331
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 24 deletions.
diff --git a/packages/builders/test/snapshots/orchestration-imports.test.js.md b/packages/builders/test/snapshots/orchestration-imports.test.js.md
@@ -366,11 +366,6 @@ Generated by [AVA](https://avajs.dev).
           },
         ],
       },
-      LocalChainAccountShape: Object @match:remotable {
-        payload: {
-          label: 'LocalChainAccount',
-        },
-      },
       OutboundConnectionHandlerI: Object @guard:interfaceGuard {
         payload: {
           defaultGuards: undefined,

diff --git a/packages/builders/test/snapshots/orchestration-imports.test.js.snap b/packages/builders/test/snapshots/orchestration-imports.test.js.snap
diff --git a/packages/orchestration/src/exos/orchestrator.js b/packages/orchestration/src/exos/orchestrator.js
@@ -4,14 +4,12 @@ import { pickFacet } from '@agoric/vat-data';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
 import { M } from '@endo/patterns';
 import {
   DenomInfoShape,
   ChainInfoShape,
   DenomAmountShape,
   DenomShape,
-  LocalChainAccountShape,
 } from '../typeGuards.js';
 
 /**
@@ -36,7 +34,6 @@ const trace = makeTracer('Orchestrator');
 /** @see {Orchestrator} */
 export const OrchestratorI = M.interface('Orchestrator', {
   getChain: M.call(M.string()).returns(Vow$(ChainInfoShape)),
-  makeLocalAccount: M.call().returns(Vow$(LocalChainAccountShape)),
   getDenomInfo: M.call(DenomShape).returns(DenomInfoShape),
   asAmount: M.call(DenomAmountShape).returns(AmountShape),
 });
@@ -46,7 +43,6 @@ export const OrchestratorI = M.interface('Orchestrator', {
  * @param {{
  *   asyncFlowTools: AsyncFlowTools;
  *   chainHub: ChainHub;
- *   localchain: Remote<LocalChain>;
  *   makeRecorderKit: MakeRecorderKit;
  *   makeLocalChainFacade: MakeLocalChainFacade;
  *   makeRemoteChainFacade: MakeRemoteChainFacade;
@@ -61,7 +57,6 @@ const prepareOrchestratorKit = (
   zone,
   {
     chainHub,
-    localchain,
     makeLocalChainFacade,
     makeRemoteChainFacade,
     vowTools: { watch, asVow },
@@ -148,9 +143,6 @@ const prepareOrchestratorKit = (
             return vow;
           });
         },
-        makeLocalAccount() {
-          return watch(E(localchain).makeAccount());
-        },
         /** @type {HostOf<Orchestrator['getDenomInfo']>} */
         getDenomInfo(denom) {
           const denomDetail = chainHub.getAsset(denom);
@@ -185,7 +177,6 @@ harden(prepareOrchestratorKit);
  * @param {{
  *   asyncFlowTools: AsyncFlowTools;
  *   chainHub: ChainHub;
- *   localchain: Remote<LocalChain>;
  *   makeRecorderKit: MakeRecorderKit;
  *   makeLocalChainFacade: MakeLocalChainFacade;
  *   makeRemoteChainFacade: MakeRemoteChainFacade;

diff --git a/packages/orchestration/src/orchestration-api.ts b/packages/orchestration/src/orchestration-api.ts
@@ -91,8 +91,8 @@ export interface Chain<CI extends ChainInfo> {
 
   // "makeAccount" suggests an operation within a vat
   /**
-   * Creates a new account on the remote chain.
-   * @returns an object that controls a new remote account on Chain
+   * Creates a new Orchestration Account on the current Chain.
+   * @returns an object that controls the account
    */
   makeAccount: () => Promise<OrchestrationAccount<CI>>;
   // FUTURE supply optional port object; also fetch port object
@@ -136,11 +136,6 @@ export interface Orchestrator {
       (C extends 'agoric' ? AgoricChainMethods : {})
   >;
 
-  /**
-   * Make a new local (Agoric) ChainAccount
-   */
-  makeLocalAccount: () => Promise<LocalChainAccount>;
-
   /**
    * For a denom, return information about a denom including the equivalent
    * local Brand, the Chain on which the denom is held, and the Chain that

diff --git a/packages/orchestration/src/typeGuards.js b/packages/orchestration/src/typeGuards.js
@@ -105,7 +105,6 @@ export const CosmosChainInfoShape = M.splitRecord(
 export const ChainInfoShape = M.splitRecord({
   chainId: M.string(),
 });
-export const LocalChainAccountShape = M.remotable('LocalChainAccount');
 export const DenomShape = M.string();
 
 /** @type {TypedPattern<DenomInfo<any, any>>} */

diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js
@@ -132,7 +132,6 @@ export const provideOrchestration = (
   const makeOrchestrator = prepareOrchestrator(zones.orchestration, {
     asyncFlowTools,
     chainHub,
-    localchain: remotePowers.localchain,
     makeRecorderKit,
     makeLocalChainFacade,
     makeRemoteChainFacade,

diff --git a/packages/orchestration/test/snapshots/exports.test.ts.md b/packages/orchestration/test/snapshots/exports.test.ts.md
@@ -26,7 +26,6 @@ Generated by [AVA](https://avajs.dev).
       'IBCConnectionInfoShape',
       'IBCTransferOptionsShape',
       'ICQMsgShape',
-      'LocalChainAccountShape',
       'OutboundConnectionHandlerI',
       'Proto3Shape',
       'TimestampProtoShape',

diff --git a/packages/orchestration/test/snapshots/exports.test.ts.snap b/packages/orchestration/test/snapshots/exports.test.ts.snap