Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: agops: no I/O (errors) until command action #7299

Merged
merged 5 commits into from
Apr 1, 2023
Merged

fix: agops: no I/O (errors) until command action #7299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
107bf96
fix: agops oracle: no IO (errors) at module import
dckc Mar 31, 2023
2a7fa8c
fix: agops psm: not I/O (errors) until command action
dckc Mar 31, 2023
d83b07d
fix: agops reserve: no I/O (errors) until command action
dckc Mar 31, 2023
9f10fbd
fix: agops vaults: no I/O (errors) until command action
dckc Mar 31, 2023
58b9d4e
fix: agops ec: no I/O (errors) until command action
dckc Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/agoric-cli/src/commands/ec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { Command } from 'commander';
import { makeRpcUtils, storageHelper } from '../lib/rpc.js';
import { outputExecuteOfferAction } from '../lib/wallet.js';

const { vstorage, fromBoard, agoricNames } = await makeRpcUtils({ fetch });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes. I think this was made one in rpc.js before but that was bad so it was factored it into a maker, but then didn't go the distance to only make where used.


/**
*
* @param {import('anylogger').Logger} _logger
Expand All @@ -24,6 +22,8 @@ export const makeEconomicCommiteeCommand = async _logger => {
`ecCommittee-${Date.now()}`,
)
.action(async function (opts) {
const { agoricNames } = await makeRpcUtils({ fetch });

const { economicCommittee } = agoricNames.instance;
assert(economicCommittee, 'missing economicCommittee');

Expand All @@ -47,6 +47,8 @@ export const makeEconomicCommiteeCommand = async _logger => {
.description('prepare an offer to accept the charter invitation')
.option('--offerId [string]', 'Offer id', String, `ecCharter-${Date.now()}`)
.action(async function (opts) {
const { agoricNames } = await makeRpcUtils({ fetch });

const { econCommitteeCharter } = agoricNames.instance;
assert(econCommitteeCharter, 'missing econCommitteeCharter');

Expand Down Expand Up @@ -79,6 +81,8 @@ export const makeEconomicCommiteeCommand = async _logger => {
Number,
)
.action(async function (opts) {
const { vstorage, fromBoard } = await makeRpcUtils({ fetch });

const questionHandleCapDataStr = await vstorage.readLatest(
'published.committees.Economic_Committee.latestQuestion',
);
Expand Down
26 changes: 16 additions & 10 deletions packages/agoric-cli/src/commands/oracle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { inspect } from 'util';
import { makeRpcUtils, storageHelper } from '../lib/rpc.js';
import { outputAction } from '../lib/wallet.js';

const { agoricNames, fromBoard, vstorage } = await makeRpcUtils({ fetch });

// XXX support other decimal places
const COSMOS_UNIT = 1_000_000n;
const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT));
Expand Down Expand Up @@ -43,14 +41,20 @@ export const makeOracleCommand = async logger => {
`,
);

const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
const name = `${brandIn}-${brandOut} price feed`;
const instance = agoricNames.instance[name];
if (!instance) {
logger.debug('known instances:', agoricNames.instance);
throw new Error(`Unknown instance ${name}`);
}
return instance;
const rpcTools = async () => {
const utils = await makeRpcUtils({ fetch });

const lookupPriceAggregatorInstance = ([brandIn, brandOut]) => {
const name = `${brandIn}-${brandOut} price feed`;
const instance = utils.agoricNames.instance[name];
if (!instance) {
logger.debug('known instances:', utils.agoricNames.instance);
throw new Error(`Unknown instance ${name}`);
}
return instance;
};

return { ...utils, lookupPriceAggregatorInstance };
};

oracle
Expand All @@ -64,6 +68,7 @@ export const makeOracleCommand = async logger => {
)
.option('--offerId [number]', 'Offer id', Number, Date.now())
.action(async function (opts) {
const { lookupPriceAggregatorInstance } = await rpcTools();
const instance = lookupPriceAggregatorInstance(opts.pair);

/** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
Expand Down Expand Up @@ -160,6 +165,7 @@ export const makeOracleCommand = async logger => {
)
.action(async function (opts) {
const { pair } = opts;
const { vstorage, fromBoard } = await rpcTools();

const capDataStr = await vstorage.readLatest(
`published.priceFeed.${pair[0]}-${pair[1]}_price_feed`,
Expand Down
64 changes: 37 additions & 27 deletions packages/agoric-cli/src/commands/psm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,6 @@ function collectValues(val, memo) {
return memo;
}

const { vstorage, fromBoard, agoricNames } = await makeRpcUtils({ fetch });

/**
*
* @param {[Minted: string, Anchor: string]} pair
*/
const getGovernanceState = async ([Minted, Anchor]) => {
const govContent = await vstorage.readLatest(
`published.psm.${Minted}.${Anchor}.governance`,
);
assert(govContent, 'no gov content');
const { current: governance } = last(
storageHelper.unserializeTxt(govContent, fromBoard),
);
const { [`psm.${Minted}.${Anchor}`]: instance } = agoricNames.instance;

return { instance, governance };
};

/**
*
* @param {import('anylogger').Logger} logger
Expand Down Expand Up @@ -81,20 +62,45 @@ export const makePsmCommand = async logger => {
`,
);

const lookupPsmInstance = ([minted, anchor]) => {
const name = `psm-${minted}-${anchor}`;
const instance = agoricNames.instance[name];
if (!instance) {
logger.debug('known instances:', agoricNames.instance);
throw new Error(`Unknown instance ${name}`);
}
return instance;
const rpcTools = async () => {
const utils = await makeRpcUtils({ fetch });

const lookupPsmInstance = ([minted, anchor]) => {
const name = `psm-${minted}-${anchor}`;
const instance = utils.agoricNames.instance[name];
if (!instance) {
logger.debug('known instances:', utils.agoricNames.instance);
throw new Error(`Unknown instance ${name}`);
}
return instance;
};

/**
*
* @param {[Minted: string, Anchor: string]} pair
*/
const getGovernanceState = async ([Minted, Anchor]) => {
const govContent = await utils.vstorage.readLatest(
`published.psm.${Minted}.${Anchor}.governance`,
);
assert(govContent, 'no gov content');
const { current: governance } = last(
storageHelper.unserializeTxt(govContent, utils.fromBoard),
);
const { [`psm.${Minted}.${Anchor}`]: instance } =
utils.agoricNames.instance;

return { instance, governance };
};

return { ...utils, lookupPsmInstance, getGovernanceState };
};

psm
.command('list')
.description('list all PSMs in network')
.action(async function () {
const { vstorage } = await rpcTools();
const mints = await vstorage.keys('published.psm');
for (const minted of mints) {
const anchors = await vstorage.keys(`published.psm.${minted}`);
Expand All @@ -116,6 +122,7 @@ export const makePsmCommand = async logger => {
)
.action(async function (opts) {
const { pair } = opts;
const { getGovernanceState } = await rpcTools();
const { governance } = await getGovernanceState(pair);
console.log('psm governance params', Object.keys(governance));
console.log('MintLimit', governance.MintLimit.value);
Expand Down Expand Up @@ -149,6 +156,7 @@ export const makePsmCommand = async logger => {
.option('--offerId [string]', 'Offer id', String, `swap-${Date.now()}`)
.action(async function (opts) {
console.warn('running with options', opts);
const { agoricNames, lookupPsmInstance } = await rpcTools();
const instance = await lookupPsmInstance(opts.pair);
const offer = Offers.psm.swap(instance, agoricNames.brand, {
offerId: opts.offerId,
Expand Down Expand Up @@ -191,6 +199,7 @@ export const makePsmCommand = async logger => {
1,
)
.action(async function (opts) {
const { lookupPsmInstance } = await rpcTools();
const psmInstance = lookupPsmInstance(opts.pair);

/** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
Expand Down Expand Up @@ -242,6 +251,7 @@ export const makePsmCommand = async logger => {
1,
)
.action(async function (opts) {
const { agoricNames, lookupPsmInstance } = await rpcTools();
const psmInstance = lookupPsmInstance(opts.pair);

const istBrand = agoricNames.brand.IST;
Expand Down
4 changes: 2 additions & 2 deletions packages/agoric-cli/src/commands/reserve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { Command } from 'commander';
import { makeRpcUtils } from '../lib/rpc.js';
import { outputExecuteOfferAction } from '../lib/wallet.js';

const { agoricNames } = await makeRpcUtils({ fetch });

/**
*
* @param {import('anylogger').Logger} _logger
Expand Down Expand Up @@ -36,6 +34,8 @@ export const makeReserveCommand = async _logger => {
1,
)
.action(async function (opts) {
const { agoricNames } = await makeRpcUtils({ fetch });

const reserveInstance = agoricNames.instance.reserve;
assert(reserveInstance, 'missing reserve in names');

Expand Down
9 changes: 5 additions & 4 deletions packages/agoric-cli/src/commands/vaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ import { normalizeAddressWithOptions } from '../lib/chain.js';
import { makeRpcUtils } from '../lib/rpc.js';
import { getCurrent, outputExecuteOfferAction } from '../lib/wallet.js';

const { agoricNames, readLatestHead } = await makeRpcUtils({
fetch,
});

/**
*
* @param {import('anylogger').Logger} logger
Expand Down Expand Up @@ -43,6 +39,8 @@ export const makeVaultsCommand = async logger => {
normalizeAddress,
)
.action(async function (opts) {
const { readLatestHead } = await makeRpcUtils({ fetch });

const current = await getCurrent(opts.from, {
readLatestHead,
});
Expand All @@ -66,6 +64,7 @@ export const makeVaultsCommand = async logger => {
.option('--collateralBrand [string]', 'Collateral brand key', 'IbcATOM')
.action(async function (opts) {
logger.warn('running with options', opts);
const { agoricNames } = await makeRpcUtils({ fetch });

const offer = Offers.vaults.OpenVault(agoricNames.brand, {
giveCollateral: opts.giveCollateral,
Expand Down Expand Up @@ -95,6 +94,7 @@ export const makeVaultsCommand = async logger => {
.requiredOption('--vaultId [string]', 'Key of vault (e.g. vault1)')
.action(async function (opts) {
logger.warn('running with options', opts);
const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });

const previousOfferId = await lookupOfferIdForVault(
opts.vaultId,
Expand Down Expand Up @@ -130,6 +130,7 @@ export const makeVaultsCommand = async logger => {
.requiredOption('--vaultId [string]', 'Key of vault (e.g. vault1)')
.action(async function (opts) {
logger.warn('running with options', opts);
const { agoricNames, readLatestHead } = await makeRpcUtils({ fetch });

const previousOfferId = await lookupOfferIdForVault(
opts.vaultId,
Expand Down