-
Notifications
You must be signed in to change notification settings - Fork 212
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into mfig-bech32-address…
…-hooks
- Loading branch information
Showing
19 changed files
with
422 additions
and
260 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| /** | ||
| * @import {Command} from 'commander'; | ||
| * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js'; | ||
| * @import {ExecuteOfferAction} from '@agoric/smart-wallet/src/smartWallet.js'; | ||
| * @import {USDCProposalShapes} from '../pool-share-math.js'; | ||
| */ | ||
|
|
||
| import { fetchEnvNetworkConfig, makeVstorageKit } from '@agoric/client-utils'; | ||
| import { InvalidArgumentError } from 'commander'; | ||
| import { | ||
| assertParsableNumber, | ||
| ceilDivideBy, | ||
| multiplyBy, | ||
| parseRatio, | ||
| } from '@agoric/zoe/src/contractSupport/ratio.js'; | ||
| import { AmountMath } from '@agoric/ertp'; | ||
| import { outputActionAndHint } from './bridge-action.js'; | ||
|
|
||
| /** @param {string} arg */ | ||
| const parseDecimal = arg => { | ||
| try { | ||
| assertParsableNumber(arg); | ||
| const n = Number(arg); | ||
| return n; | ||
| } catch { | ||
| throw new InvalidArgumentError('Not a number'); | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * @param {string} amountString | ||
| * @param {Brand} usdc | ||
| */ | ||
| const parseUSDCAmount = (amountString, usdc) => { | ||
| const USDC_DECIMALS = 6; | ||
| const unit = AmountMath.make(usdc, 10n ** BigInt(USDC_DECIMALS)); | ||
| return multiplyBy(unit, parseRatio(amountString, usdc)); | ||
| }; | ||
|
|
||
| /** | ||
| * @param {Command} program | ||
| * @param {{ | ||
| * fetch?: Window['fetch']; | ||
| * vstorageKit?: Awaited<ReturnType<typeof makeVstorageKit>>; | ||
| * stdout: typeof process.stdout; | ||
| * stderr: typeof process.stderr; | ||
| * env: typeof process.env; | ||
| * now: typeof Date.now; | ||
| * }} io | ||
| */ | ||
| export const addLPCommands = ( | ||
| program, | ||
| { fetch, vstorageKit, stderr, stdout, env, now }, | ||
| ) => { | ||
| const loadVsk = async () => { | ||
| if (vstorageKit) { | ||
| return vstorageKit; | ||
| } | ||
| assert(fetch); | ||
| const networkConfig = await fetchEnvNetworkConfig({ env, fetch }); | ||
| return makeVstorageKit({ fetch }, networkConfig); | ||
| }; | ||
| /** @type {undefined | ReturnType<typeof loadVsk>} */ | ||
| let vskP; | ||
|
|
||
| program | ||
| .command('deposit') | ||
| .description('Deposit USDC into pool') | ||
| .addHelpText( | ||
| 'after', | ||
| '\nPipe the STDOUT to a file such as deposit.json, then use the Agoric CLI to broadcast it:\n agoric wallet send --offer deposit.json --from gov1 --keyring-backend="test"', | ||
| ) | ||
| .requiredOption('--amount <number>', 'USDC amount', parseDecimal) | ||
| .option('--offerId <string>', 'Offer id', String, `lpDeposit-${now()}`) | ||
| .action(async opts => { | ||
| vskP ||= loadVsk(); | ||
| const vsk = await vskP; | ||
| /** @type {Brand<'nat'>} */ | ||
| // @ts-expect-error it doesnt recognize usdc as a Brand type | ||
| const usdc = vsk.agoricNames.brand.USDC; | ||
| assert(usdc, 'USDC brand not in agoricNames'); | ||
|
|
||
| const usdcAmount = parseUSDCAmount(opts.amount, usdc); | ||
|
|
||
| /** @type {USDCProposalShapes['deposit']} */ | ||
| const proposal = { | ||
| give: { | ||
| USDC: usdcAmount, | ||
| }, | ||
| }; | ||
|
|
||
| /** @type {OfferSpec} */ | ||
| const offer = { | ||
| id: opts.offerId, | ||
| invitationSpec: { | ||
| source: 'agoricContract', | ||
| instancePath: ['fastUsdc'], | ||
| callPipe: [['makeDepositInvitation', []]], | ||
| }, | ||
| proposal, | ||
| }; | ||
|
|
||
| /** @type {ExecuteOfferAction} */ | ||
| const bridgeAction = { | ||
| method: 'executeOffer', | ||
| offer, | ||
| }; | ||
|
|
||
| outputActionAndHint(bridgeAction, { stderr, stdout }, vsk.marshaller); | ||
| }); | ||
|
|
||
| program | ||
| .command('withdraw') | ||
| .description("Withdraw USDC from the LP's pool share") | ||
| .addHelpText( | ||
| 'after', | ||
| '\nPipe the STDOUT to a file such as withdraw.json, then use the Agoric CLI to broadcast it:\n agoric wallet send --offer withdraw.json --from gov1 --keyring-backend="test"', | ||
| ) | ||
| .requiredOption('--amount <number>', 'USDC amount', parseDecimal) | ||
| .option('--offerId <string>', 'Offer id', String, `lpWithdraw-${now()}`) | ||
| .action(async opts => { | ||
| vskP ||= loadVsk(); | ||
| const vsk = await vskP; | ||
|
|
||
| /** @type {Brand<'nat'>} */ | ||
| // @ts-expect-error it doesnt recognize FastLP as a Brand type | ||
| const poolShare = vsk.agoricNames.brand.FastLP; | ||
| assert(poolShare, 'FastLP brand not in agoricNames'); | ||
|
|
||
| /** @type {Brand<'nat'>} */ | ||
| // @ts-expect-error it doesnt recognize usdc as a Brand type | ||
| const usdc = vsk.agoricNames.brand.USDC; | ||
| assert(usdc, 'USDC brand not in agoricNames'); | ||
|
|
||
| const usdcAmount = parseUSDCAmount(opts.amount, usdc); | ||
|
|
||
| /** @type {import('../types.js').PoolMetrics} */ | ||
| // @ts-expect-error it treats this as "unknown" | ||
| const metrics = await vsk.readPublished('fastUsdc.poolMetrics'); | ||
| const fastLPAmount = ceilDivideBy(usdcAmount, metrics.shareWorth); | ||
|
|
||
| /** @type {USDCProposalShapes['withdraw']} */ | ||
| const proposal = { | ||
| give: { | ||
| PoolShare: fastLPAmount, | ||
| }, | ||
| want: { | ||
| USDC: usdcAmount, | ||
| }, | ||
| }; | ||
|
|
||
| /** @type {OfferSpec} */ | ||
| const offer = { | ||
| id: opts.offerId, | ||
| invitationSpec: { | ||
| source: 'agoricContract', | ||
| instancePath: ['fastUsdc'], | ||
| callPipe: [['makeWithdrawInvitation', []]], | ||
| }, | ||
| proposal, | ||
| }; | ||
|
|
||
| outputActionAndHint( | ||
| { method: 'executeOffer', offer }, | ||
| { stderr, stdout }, | ||
| vsk.marshaller, | ||
| ); | ||
| }); | ||
|
|
||
| return program; | ||
| }; |
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
Oops, something went wrong.