9281 durable orchestrator #9532
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,67 @@ | ||||||
| /** @file ChainAccount exo */ | ||||||
| import { V } from '@agoric/vow/vat.js'; | ||||||
|
|
||||||
| import { ChainFacadeI } from '../typeGuards.js'; | ||||||
|
|
||||||
| /** | ||||||
| * @import {Zone} from '@agoric/base-zone'; | ||||||
| * @import {TimerService} from '@agoric/time'; | ||||||
| * @import {Remote} from '@agoric/internal'; | ||||||
| * @import {LocalChain} from '@agoric/vats/src/localchain.js'; | ||||||
| * @import {OrchestrationService} from '../service.js'; | ||||||
| * @import {MakeLocalOrchestrationAccountKit} from './local-orchestration-account.js'; | ||||||
| * @import {ChainInfo, CosmosChainInfo, IBCConnectionInfo, OrchestrationAccount} from '../types.js'; | ||||||
| */ | ||||||
|
|
||||||
| /** | ||||||
| * @param {Zone} zone | ||||||
| * @param {{ | ||||||
| * makeLocalOrchestrationAccountKit: MakeLocalOrchestrationAccountKit; | ||||||
| * orchestration: Remote<OrchestrationService>; | ||||||
| * storageNode: Remote<StorageNode>; | ||||||
| * timer: Remote<TimerService>; | ||||||
| * localchain: Remote<LocalChain>; | ||||||
| * }} powers | ||||||
| */ | ||||||
| export const prepareLocalChainFacade = ( | ||||||
| zone, | ||||||
| { makeLocalOrchestrationAccountKit, localchain, storageNode }, | ||||||
| ) => | ||||||
| zone.exoClass( | ||||||
| 'LocalChainFacade', | ||||||
| ChainFacadeI, | ||||||
| /** | ||||||
| * @param {CosmosChainInfo} localChainInfo | ||||||
| */ | ||||||
| localChainInfo => { | ||||||
| return { localChainInfo }; | ||||||
| }, | ||||||
| { | ||||||
| async getChainInfo() { | ||||||
| return this.state.localChainInfo; | ||||||
| }, | ||||||
|
|
||||||
| // FIXME parameterize on the remoteChainInfo to make() | ||||||
| // That used to work but got lost in the migration to Exo | ||||||
| /** @returns {Promise<OrchestrationAccount<ChainInfo>>} */ | ||||||
| async makeAccount() { | ||||||
| const { localChainInfo } = this.state; | ||||||
| const lcaP = V(localchain).makeAccount(); | ||||||
| const [lca, address] = await Promise.all([lcaP, V(lcaP).getAddress()]); | ||||||
| const { holder: account } = makeLocalOrchestrationAccountKit({ | ||||||
| account: lca, | ||||||
| address: harden({ | ||||||
| address, | ||||||
| chainId: localChainInfo.chainId, | ||||||
| addressEncoding: 'bech32', | ||||||
| }), | ||||||
| // FIXME storage path | ||||||
|
There was a problem hiding this comment. What ticket capture this? Maybe vstorage logging ?
Suggested change
There was a problem hiding this comment. Thanks for looking these up. I expect we'll get to them soon so I'll let this merge as is to save the CI time. Maybe include the links on a next PR. |
||||||
| storageNode, | ||||||
| }); | ||||||
|
|
||||||
| return account; | ||||||
| }, | ||||||
| }, | ||||||
| ); | ||||||
| harden(prepareLocalChainFacade); | ||||||
| /** @typedef {ReturnType<typeof prepareLocalChainFacade>} MakeLocalChainFacade */ | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,27 @@ | ||
| /** @file Use-object for the owner of a localchain account */ | ||
| import { typedJson } from '@agoric/cosmic-proto/vatsafe'; | ||
| import { AmountShape, PaymentShape } from '@agoric/ertp'; | ||
| import { makeTracer } from '@agoric/internal'; | ||
| import { M } from '@agoric/vat-data'; | ||
| import { V } from '@agoric/vow/vat.js'; | ||
| import { TopicsRecordShape } from '@agoric/zoe/src/contractSupport/index.js'; | ||
| import { InvitationShape } from '@agoric/zoe/src/typeGuards.js'; | ||
| import { E } from '@endo/far'; | ||
| import { maxClockSkew } from '../utils/cosmos.js'; | ||
| import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js'; | ||
| import { dateInSeconds, makeTimestampHelper } from '../utils/time.js'; | ||
|
|
||
| /** | ||
| * @import {LocalChainAccount} from '@agoric/vats/src/localchain.js'; | ||
| * @import {AmountArg, ChainAddress, DenomAmount, IBCMsgTransferOptions, OrchestrationAccount, OrchestrationAccountI} from '@agoric/orchestration'; | ||
| * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'. | ||
| * @import {Zone} from '@agoric/zone'; | ||
| * @import {Remote} from '@agoric/internal'; | ||
| * @import {TimerService, TimerBrand} from '@agoric/time'; | ||
| * @import {ChainHub} from '../utils/chainHub.js'; | ||
| */ | ||
|
|
||
| const trace = makeTracer('LOA'); | ||
|
|
||
| const { Fail } = assert; | ||
| /** | ||
|
|
@@ -38,20 +33,16 @@ const { Fail } = assert; | |
| * @typedef {{ | ||
| * topicKit: RecorderKit<LocalChainAccountNotification>; | ||
| * account: LocalChainAccount; | ||
| * address: ChainAddress; | ||
| * }} State | ||
| */ | ||
|
|
||
| const HolderI = M.interface('holder', { | ||
| ...orchestrationAccountMethods, | ||
| getPublicTopics: M.call().returns(TopicsRecordShape), | ||
| delegate: M.call(M.string(), AmountShape).returns(M.promise()), | ||
| undelegate: M.call(M.string(), AmountShape).returns(M.promise()), | ||
| withdraw: M.callWhen(AmountShape).returns(PaymentShape), | ||
| executeTx: M.callWhen(M.arrayOf(M.record())).returns(M.arrayOf(M.record())), | ||
| }); | ||
|
|
||
|
|
@@ -67,18 +58,18 @@ const PUBLIC_TOPICS = { | |
| * @param {Remote<TimerService>} timerService | ||
| * @param {ChainHub} chainHub | ||
| */ | ||
| export const prepareLocalOrchestrationAccountKit = ( | ||
|
|
||
| zone, | ||
| makeRecorderKit, | ||
| zcf, | ||
| timerService, | ||
| chainHub, | ||
| ) => { | ||
| const timestampHelper = makeTimestampHelper(timerService); | ||
|
|
||
| /** Make an object wrapping an LCA with Zoe interfaces. */ | ||
| const makeLocalOrchestrationAccountKit = zone.exoClassKit( | ||
| 'Local Orchestration Account Kit', | ||
| { | ||
| holder: HolderI, | ||
| invitationMakers: M.interface('invitationMakers', { | ||
|
|
@@ -92,16 +83,15 @@ export const prepareLocalChainAccountKit = ( | |
| /** | ||
| * @param {object} initState | ||
| * @param {LocalChainAccount} initState.account | ||
| * @param {ChainAddress} initState.address | ||
| * @param {Remote<StorageNode>} initState.storageNode | ||
| * @returns {State} | ||
| */ | ||
| ({ account, address, storageNode }) => { | ||
| // must be the fully synchronous maker because the kit is held in durable state | ||
| // @ts-expect-error XXX Patterns | ||
| const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]); | ||
|
|
||
| return { account, address, topicKit }; | ||
| }, | ||
| { | ||
|
|
@@ -138,6 +128,24 @@ export const prepareLocalChainAccountKit = ( | |
| }, | ||
| }, | ||
| holder: { | ||
| /** @type {OrchestrationAccount<any>['getBalance']} */ | ||
| async getBalance(denomArg) { | ||
| // FIXME look up real values | ||
| // UNTIL https://github.com/Agoric/agoric-sdk/issues/9211 | ||
| const [brand, denom] = | ||
| typeof denomArg === 'string' | ||
| ? [/** @type {any} */ (null), denomArg] | ||
| : [denomArg, 'FIXME']; | ||
|
|
||
| const natAmount = await V.when( | ||
| E(this.state.account).getBalance(brand), | ||
| ); | ||
| return harden({ denom, value: natAmount.value }); | ||
| }, | ||
| getBalances() { | ||
| throw new Error('not yet implemented'); | ||
| }, | ||
|
|
||
| getPublicTopics() { | ||
| const { topicKit } = this.state; | ||
| return harden({ | ||
|
|
@@ -207,9 +215,9 @@ export const prepareLocalChainAccountKit = ( | |
| * updater will get a special notification that the account is being | ||
| * transferred. | ||
| */ | ||
| /** @type {OrchestrationAccount<any>['deposit']} */ | ||
| async deposit(payment) { | ||
| await V(this.state.account).deposit(payment); | ||
|
There was a problem hiding this comment. In a future PR we might consider updating Tangentially - with the revised implementation plan for #9193 only |
||
| }, | ||
| /** @type {LocalChainAccount['withdraw']} */ | ||
| async withdraw(amount) { | ||
|
|
@@ -220,9 +228,13 @@ export const prepareLocalChainAccountKit = ( | |
| // @ts-expect-error subtype | ||
| return V(this.state.account).executeTx(messages); | ||
| }, | ||
| /** @returns {ChainAddress} */ | ||
| getAddress() { | ||
| return this.state.address; | ||
| }, | ||
| async send(toAccount, amount) { | ||
| // FIXME implement | ||
| console.log('send got', toAccount, amount); | ||
| }, | ||
| /** | ||
| * @param {AmountArg} amount an ERTP {@link Amount} or a | ||
|
|
@@ -261,7 +273,7 @@ export const prepareLocalChainAccountKit = ( | |
| amount: String(amount.value), | ||
| denom: amount.denom, | ||
| }, | ||
| sender: this.state.address.address, | ||
| receiver: destination.address, | ||
| timeoutHeight: opts?.timeoutHeight ?? { | ||
| revisionHeight: 0n, | ||
|
|
@@ -273,10 +285,15 @@ export const prepareLocalChainAccountKit = ( | |
| ]); | ||
| trace('MsgTransfer result', result); | ||
| }, | ||
| /** @type {OrchestrationAccount<any>['transferSteps']} */ | ||
| transferSteps(amount, msg) { | ||
| console.log('transferSteps got', amount, msg); | ||
| return Promise.resolve(); | ||
| }, | ||
| }, | ||
| }, | ||
| ); | ||
| return makeLocalOrchestrationAccountKit; | ||
| }; | ||
| /** @typedef {ReturnType<typeof prepareLocalOrchestrationAccountKit>} MakeLocalOrchestrationAccountKit */ | ||
| /** @typedef {ReturnType<MakeLocalOrchestrationAccountKit>} LocalOrchestrationAccountKit */ | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.