diff --git a/packages/builders/test/snapshots/orchestration-imports.test.js.md b/packages/builders/test/snapshots/orchestration-imports.test.js.md index b5c7b79b235..386f751d75c 100644 --- 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 index e5d97ebf415..1a15f9da651 100644 Binary files a/packages/builders/test/snapshots/orchestration-imports.test.js.snap and b/packages/builders/test/snapshots/orchestration-imports.test.js.snap differ diff --git a/packages/orchestration/src/exos/orchestrator.js b/packages/orchestration/src/exos/orchestrator.js index 87b429824ef..97e383dcf12 100644 --- 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), }); @@ -44,24 +41,16 @@ export const OrchestratorI = M.interface('Orchestrator', { /** * @param {Zone} zone * @param {{ - * asyncFlowTools: AsyncFlowTools; * chainHub: ChainHub; - * localchain: Remote; - * makeRecorderKit: MakeRecorderKit; * makeLocalChainFacade: MakeLocalChainFacade; * makeRemoteChainFacade: MakeRemoteChainFacade; - * orchestrationService: Remote; - * storageNode: Remote; - * timerService: Remote; * vowTools: VowTools; - * zcf: ZCF; * }} powers */ const prepareOrchestratorKit = ( zone, { chainHub, - localchain, makeLocalChainFacade, makeRemoteChainFacade, vowTools: { watch, asVow }, @@ -148,9 +137,6 @@ const prepareOrchestratorKit = ( return vow; }); }, - makeLocalAccount() { - return watch(E(localchain).makeAccount()); - }, /** @type {HostOf} */ getDenomInfo(denom) { const denomDetail = chainHub.getAsset(denom); @@ -183,17 +169,10 @@ harden(prepareOrchestratorKit); /** * @param {Zone} zone * @param {{ - * asyncFlowTools: AsyncFlowTools; * chainHub: ChainHub; - * localchain: Remote; - * makeRecorderKit: MakeRecorderKit; * makeLocalChainFacade: MakeLocalChainFacade; * makeRemoteChainFacade: MakeRemoteChainFacade; - * orchestrationService: Remote; - * storageNode: Remote; - * timerService: Remote; * vowTools: VowTools; - * zcf: ZCF; * }} powers */ export const prepareOrchestrator = (zone, powers) => { diff --git a/packages/orchestration/src/orchestration-api.ts b/packages/orchestration/src/orchestration-api.ts index ef4ba1cb5b2..cf8f84d9c07 100644 --- a/packages/orchestration/src/orchestration-api.ts +++ b/packages/orchestration/src/orchestration-api.ts @@ -91,8 +91,8 @@ export interface Chain { // "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>; // 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; - /** * 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 index 1d9bcbe44dc..2e08fb747f9 100644 --- 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>} */ diff --git a/packages/orchestration/src/utils/start-helper.js b/packages/orchestration/src/utils/start-helper.js index 47c71563116..366542e0e02 100644 --- a/packages/orchestration/src/utils/start-helper.js +++ b/packages/orchestration/src/utils/start-helper.js @@ -130,17 +130,10 @@ export const provideOrchestration = ( }); const makeOrchestrator = prepareOrchestrator(zones.orchestration, { - asyncFlowTools, chainHub, - localchain: remotePowers.localchain, - makeRecorderKit, makeLocalChainFacade, makeRemoteChainFacade, - storageNode: remotePowers.storageNode, - orchestrationService: remotePowers.orchestrationService, - timerService, vowTools, - zcf, }); /** diff --git a/packages/orchestration/test/snapshots/exports.test.ts.md b/packages/orchestration/test/snapshots/exports.test.ts.md index ddb5358d0ca..2b058658b22 100644 --- 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 index 4d12f860a93..fab9e78c6b8 100644 Binary files a/packages/orchestration/test/snapshots/exports.test.ts.snap and b/packages/orchestration/test/snapshots/exports.test.ts.snap differ