Skip to content

Commit 4d54c56

Browse files
committed
fixup! chore(types): Orchestration continuing offers
1 parent 051064f commit 4d54c56

4 files changed

Lines changed: 11 additions & 17 deletions

File tree

packages/orchestration/src/exos/cosmos-orchestration-account.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
4545
* @import {Zone} from '@agoric/zone';
4646
* @import {ResponseQuery} from '@agoric/cosmic-proto/tendermint/abci/types.js';
4747
* @import {JsonSafe} from '@agoric/cosmic-proto';
48+
* @import {Matcher} from '@endo/patterns';
4849
*/
4950

5051
const trace = makeTracer('ComosOrchestrationAccountHolder');
@@ -83,7 +84,7 @@ export const IcaAccountHolderI = M.interface('IcaAccountHolder', {
8384
undelegate: M.call(M.arrayOf(DelegationShape)).returns(VowShape),
8485
});
8586

86-
/** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
87+
/** @type {{ [name: string]: [description: string, valueShape: Matcher] }} */
8788
const PUBLIC_TOPICS = {
8889
account: ['Staking Account holder status', M.any()],
8990
};
@@ -160,7 +161,6 @@ export const prepareCosmosOrchestrationAccountKit = (
160161
(chainAddress, bondDenom, io) => {
161162
const { storageNode, ...rest } = io;
162163
// must be the fully synchronous maker because the kit is held in durable state
163-
// @ts-expect-error XXX Patterns
164164
const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
165165
// TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
166166
void E(topicKit.recorder).write('');

packages/orchestration/src/exos/local-orchestration-account.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { makeTimestampHelper } from '../utils/time.js';
2929
* @import {TimerService, TimerBrand, TimestampRecord} from '@agoric/time';
3030
* @import {PromiseVow, Vow, VowTools} from '@agoric/vow';
3131
* @import {TypedJson, JsonSafe} from '@agoric/cosmic-proto';
32+
* @import {Matcher} from '@endo/patterns';
3233
* @import {ChainHub} from './chain-hub.js';
3334
*/
3435

@@ -59,7 +60,7 @@ const HolderI = M.interface('holder', {
5960
executeTx: M.call(M.arrayOf(M.record())).returns(Vow$(M.record())),
6061
});
6162

62-
/** @type {{ [name: string]: [description: string, valueShape: Pattern] }} */
63+
/** @type {{ [name: string]: [description: string, valueShape: Matcher] }} */
6364
const PUBLIC_TOPICS = {
6465
account: ['Account holder status', M.any()],
6566
};
@@ -138,7 +139,6 @@ export const prepareLocalOrchestrationAccountKit = (
138139
*/
139140
({ account, address, storageNode }) => {
140141
// must be the fully synchronous maker because the kit is held in durable state
141-
// @ts-expect-error XXX Patterns
142142
const topicKit = makeRecorderKit(storageNode, PUBLIC_TOPICS.account[1]);
143143
// TODO determine what goes in vstorage https://github.com/Agoric/agoric-sdk/issues/9066
144144
void E(topicKit.recorder).write('');

packages/orchestration/src/orchestration-api.ts

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,15 @@
55
* - should remain relatively stable.
66
*/
77
import type { Amount, Brand, NatAmount } from '@agoric/ertp/src/types.js';
8-
import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
9-
import type { Timestamp } from '@agoric/time';
10-
import type {
11-
ContinuingOfferResult,
12-
InvitationMakers,
13-
} from '@agoric/smart-wallet/src/types.js';
14-
import type {
15-
ResolvedPublicTopic,
16-
TopicsRecord,
17-
} from '@agoric/zoe/src/contractSupport/topics.js';
188
import type { CurrentWalletRecord } from '@agoric/smart-wallet/src/smartWallet.js';
19-
import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
9+
import type { Timestamp } from '@agoric/time';
10+
import type { LocalChainAccount } from '@agoric/vats/src/localchain.js';
11+
import type { ResolvedPublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
2012
import type {
2113
ChainInfo,
2214
CosmosChainAccountMethods,
2315
CosmosChainInfo,
2416
IBCMsgTransferOptions,
25-
IcaAccount,
2617
KnownChains,
2718
LocalAccountMethods,
2819
} from './types.js';

packages/zoe/src/contractSupport/topics.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export const PublicTopicShape = M.splitRecord(
2222
*/
2323

2424
/**
25-
* A {PublicTopic} in which the `storagePath` is a string.
25+
* A {PublicTopic} in which the `storagePath` is always a resolved string.
26+
*
27+
* Useful when working with Vows and async-flow.
28+
*
2629
* @template {object} T topic value
2730
* @typedef {{
2831
* description?: string,

0 commit comments

Comments
 (0)