-
Notifications
You must be signed in to change notification settings - Fork 212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
use TS satisfies #8032
Merged
Merged
use TS satisfies #8032
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,8 +9,6 @@ import { parseRatio } from '@agoric/zoe/src/contractSupport/ratio.js'; | |
const COSMOS_UNIT = 1_000_000n; | ||
const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT)); | ||
|
||
// TODO use '@satisfies" in TS 5.1 to make sure these each conform to OfferMaker interface | ||
|
||
// NB: not really a Proposal because the brands are not remotes | ||
// Instead they're copyRecord like "{"boardId":"board0257","iface":"Alleged: IST brand"}" to pass through the boardId | ||
// mustMatch(harden(proposal), ProposalShape); | ||
|
@@ -143,11 +141,10 @@ export const lookupOfferIdForVault = async (vaultId, currentP) => { | |
}; | ||
|
||
/** | ||
* @param {Record<string, Brand>} brands | ||
* @param {Record<string, import('@agoric/internal/src/marshal.js').BoardRemote>} brands | ||
* @param {({ wantMinted: number, giveMinted?: undefined } | { giveMinted: number, wantMinted?: undefined })} opts | ||
* @param {number} [fee=0] | ||
* @param {number} [fee] | ||
* @param {string} [anchor] | ||
* @returns {Proposal} XXX not a real proposal, uses BoardRemote | ||
*/ | ||
const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => { | ||
const giving = 'giveMinted' in opts ? 'minted' : 'anchor'; | ||
|
@@ -202,15 +199,13 @@ const makePsmSwapOffer = ({ brand }, instance, opts) => { | |
instance, | ||
publicInvitationMaker: method, | ||
}, | ||
// @ts-expect-error BoardRemote not a Brand object | ||
proposal, | ||
}; | ||
}; | ||
|
||
/** | ||
* @param {{ | ||
* brand: Record<string, Brand>, | ||
* vbankAsset: Record<string, { brand: Brand, displayInfo: DisplayInfo }>, | ||
* }} agoricNames | ||
* @param {Pick<import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes, 'brand' | 'vbankAsset'>} agoricNames | ||
* @param {(msg: string) => Error} makeError error constructor | ||
* @returns {(a: string) => Amount<'nat'>} | ||
*/ | ||
|
@@ -329,6 +324,7 @@ const makeAddCollateralOffer = ({ brand }, opts) => { | |
/** @type {AmountKeywordRecord} */ | ||
const give = { | ||
Collateral: AmountMath.make( | ||
// @ts-expect-error BoardRemote not a Brand object | ||
brand[opts.collateralBrandKey], | ||
scaleDecimals(opts.give), | ||
), | ||
|
@@ -373,6 +369,9 @@ const makePushPriceOffer = (_agoricNames, opts, previousOffer) => { | |
}; | ||
}; | ||
|
||
/** | ||
* @satisfies {Record<string, Record<string, import('@agoric/smart-wallet/src/types.js').OfferMaker>>} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. TIL:
|
||
*/ | ||
export const Offers = { | ||
auction: { | ||
Bid: makeBidOffer, | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
// @ts-check | ||
/** | ||
* @typedef {{ | ||
* brand: import('@agoric/internal/src/marshal.js').BoardRemote & Brand, | ||
* brand: import('@agoric/internal/src/marshal.js').BoardRemote, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
* denom: string, | ||
* displayInfo: DisplayInfo, | ||
* issuer: import('@agoric/internal/src/marshal.js').BoardRemote & Issuer, | ||
* issuer: import('@agoric/internal/src/marshal.js').BoardRemote, | ||
* issuerName: string, | ||
* proposedName: string, | ||
* }} VBankAssetDetail | ||
*/ | ||
/** | ||
* @typedef {{ | ||
* brand: Record<string, Brand>, | ||
* brand: Record<string, import('@agoric/internal/src/marshal.js').BoardRemote>, | ||
* instance: Record<string, Instance>, | ||
* vbankAsset: Record<string, VBankAssetDetail>, | ||
* reverse: Record<string, string>, | ||
|
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.
This
NB:
is no longer the case, is it?makeBoardRemote
usesFar
. The change to smallcaps made it necessary, IIRC.