From 23a0822bba3e588463276396ca6bb4eb27b3f213 Mon Sep 17 00:00:00 2001 From: Michael FIG Date: Thu, 21 Sep 2023 17:57:08 -0600 Subject: [PATCH] chore(cosmic-swingset): `coreProposals.steps` demo --- .../cosmic-swingset/economy-template.json | 262 ++++++++-------- .../vm-config/decentral-devnet-config.json | 292 +++++++++--------- 2 files changed, 285 insertions(+), 269 deletions(-) diff --git a/packages/cosmic-swingset/economy-template.json b/packages/cosmic-swingset/economy-template.json index a043fa260b5..0e0f9b2a004 100644 --- a/packages/cosmic-swingset/economy-template.json +++ b/packages/cosmic-swingset/economy-template.json @@ -1,138 +1,146 @@ -[ - "@agoric/builders/scripts/vats/init-core.js", - "@agoric/builders/scripts/vats/init-network.js", - { - "module": "@agoric/builders/scripts/inter-protocol/init-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ +{ + "steps": [ + [ + "@agoric/builders/scripts/vats/init-core.js" + ], + [ + "@agoric/builders/scripts/vats/init-network.js", + "@agoric/builders/scripts/pegasus/init-core.js" + ], + [ { - "econCommitteeOptions": { - "committeeSize": 1 - }, - "minInitialPoolLiquidity": "0" - } - ] - }, - "@agoric/builders/scripts/pegasus/init-core.js", - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/init-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "econCommitteeOptions": { + "committeeSize": 1 + }, + "minInitialPoolLiquidity": "0" + } + ] + }, { - "interchainAssetOptions": { - "denom": "ibc/toyatom", - "decimalPlaces": 4, - "keyword": "ATOM", - "oracleBrand": "ATOM", - "proposedName": "ATOM" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "interchainAssetOptions": { + "denom": "ibc/toyatom", + "decimalPlaces": 4, + "keyword": "ATOM", + "oracleBrand": "ATOM", + "proposedName": "ATOM" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyusdc", - "decimalPlaces": 6, - "keyword": "USDC_axl", - "proposedName": "USD Coin" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyusdc", + "decimalPlaces": 6, + "keyword": "USDC_axl", + "proposedName": "USD Coin" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/usdc5678", - "decimalPlaces": 6, - "keyword": "USDC_grv", - "proposedName": "USC Coin" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/usdc5678", + "decimalPlaces": 6, + "keyword": "USDC_grv", + "proposedName": "USC Coin" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/usdt1234", - "decimalPlaces": 6, - "keyword": "USDT_axl", - "proposedName": "Tether USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/usdt1234", + "decimalPlaces": 6, + "keyword": "USDT_axl", + "proposedName": "Tether USD" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyollie", - "decimalPlaces": 6, - "keyword": "USDT_grv", - "proposedName": "Tether USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyollie", + "decimalPlaces": 6, + "keyword": "USDT_grv", + "proposedName": "Tether USD" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyellie", - "decimalPlaces": 6, - "keyword": "AUSD", - "proposedName": "Anchor USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyellie", + "decimalPlaces": 6, + "keyword": "AUSD", + "proposedName": "Anchor USD" + } + } + ] + }, { - "AGORIC_INSTANCE_NAME": "ATOM-USD price feed", - "oracleAddresses": [ - "@PRIMARY_ADDRESS@", - "agoric1dy0yegdsev4xvce3dx7zrz2ad9pesf5svzud6y" - ], - "IN_BRAND_LOOKUP": [ - "agoricNames", - "oracleBrand", - "ATOM" - ], - "IN_BRAND_DECIMALS": 6, - "OUT_BRAND_LOOKUP": [ - "agoricNames", - "oracleBrand", - "USD" - ], - "OUT_BRAND_DECIMALS": 4 - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "AGORIC_INSTANCE_NAME": "ATOM-USD price feed", + "oracleAddresses": [ + "@PRIMARY_ADDRESS@", + "agoric1dy0yegdsev4xvce3dx7zrz2ad9pesf5svzud6y" + ], + "IN_BRAND_LOOKUP": [ + "agoricNames", + "oracleBrand", + "ATOM" + ], + "IN_BRAND_DECIMALS": 6, + "OUT_BRAND_LOOKUP": [ + "agoricNames", + "oracleBrand", + "USD" + ], + "OUT_BRAND_DECIMALS": 4 + } + ] + }, { - "voterAddresses": { - "someone": "@PRIMARY_ADDRESS@" - } + "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "voterAddresses": { + "someone": "@PRIMARY_ADDRESS@" + } + } + ] } ] - } -] + ] +} diff --git a/packages/vm-config/decentral-devnet-config.json b/packages/vm-config/decentral-devnet-config.json index f6d0fbf07a4..74aa6fe0b5f 100644 --- a/packages/vm-config/decentral-devnet-config.json +++ b/packages/vm-config/decentral-devnet-config.json @@ -2,159 +2,167 @@ "$comment": "This SwingSet config file (see loadSwingsetConfigFile) includes non-production facilities such as a faucet. Pending #5819, it includes vaults in coreProposals; once #5819 is done, vaults are expected to be added by devnet governance.", "bootstrap": "bootstrap", "defaultReapInterval": 1000, - "coreProposals": [ - "@agoric/builders/scripts/vats/init-core.js", - "@agoric/builders/scripts/vats/init-network.js", - { - "module": "@agoric/builders/scripts/inter-protocol/init-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "coreProposals": { + "steps": [ + [ + "@agoric/builders/scripts/vats/init-core.js" + ], + [ + "@agoric/builders/scripts/vats/init-network.js" + ], + [ { - "econCommitteeOptions": { - "committeeSize": 3 - }, - "referencedUi": "bafybeidvpbtlgefi3ptuqzr2fwfyfjqfj6onmye63ij7qkrb4yjxekdh3e", - "minInitialPoolLiquidity": "0" - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/init-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "econCommitteeOptions": { + "committeeSize": 3 + }, + "referencedUi": "bafybeidvpbtlgefi3ptuqzr2fwfyfjqfj6onmye63ij7qkrb4yjxekdh3e", + "minInitialPoolLiquidity": "0" + } + ] + }, { - "interchainAssetOptions": { - "denom": "ibc/toyatom", - "decimalPlaces": 6, - "initialPrice": 12.34, - "keyword": "ATOM", - "oracleBrand": "ATOM", - "proposedName": "ATOM" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "interchainAssetOptions": { + "denom": "ibc/toyatom", + "decimalPlaces": 6, + "initialPrice": 12.34, + "keyword": "ATOM", + "oracleBrand": "ATOM", + "proposedName": "ATOM" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyusdc", - "decimalPlaces": 6, - "keyword": "USDC_axl", - "proposedName": "USD Coin" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyusdc", + "decimalPlaces": 6, + "keyword": "USDC_axl", + "proposedName": "USD Coin" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/usdc5678", - "decimalPlaces": 6, - "keyword": "USDC_grv", - "proposedName": "USC Coin" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/usdc5678", + "decimalPlaces": 6, + "keyword": "USDC_grv", + "proposedName": "USC Coin" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/usdt1234", - "decimalPlaces": 6, - "keyword": "USDT_axl", - "proposedName": "Tether USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/usdt1234", + "decimalPlaces": 6, + "keyword": "USDT_axl", + "proposedName": "Tether USD" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyollie", - "decimalPlaces": 6, - "keyword": "USDT_grv", - "proposedName": "Tether USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", - "entrypoint": "psmProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyollie", + "decimalPlaces": 6, + "keyword": "USDT_grv", + "proposedName": "Tether USD" + } + } + ] + }, { - "anchorOptions": { - "denom": "ibc/toyellie", - "decimalPlaces": 6, - "keyword": "AUSD", - "proposedName": "Anchor USD" - } - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/add-collateral-core.js", + "entrypoint": "psmProposalBuilder", + "args": [ + { + "anchorOptions": { + "denom": "ibc/toyellie", + "decimalPlaces": 6, + "keyword": "AUSD", + "proposedName": "Anchor USD" + } + } + ] + }, { - "contractTerms": { - "POLL_INTERVAL": 30, - "maxSubmissionCount": 1000, - "minSubmissionCount": 3, - "restartDelay": 1, - "timeout": 10, - "minSubmissionValue": 1, - "maxSubmissionValue": 9007199254740991 - }, - "AGORIC_INSTANCE_NAME": "ATOM-USD price feed", - "oracleAddresses": [ - "agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk", - "agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf", - "agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft", - "agoric1ra0g6crtsy6r3qnpu7ruvm7qd4wjnznyzg5nu4", - "agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82" - ], - "IN_BRAND_LOOKUP": [ - "agoricNames", - "oracleBrand", - "ATOM" - ], - "IN_BRAND_DECIMALS": 6, - "OUT_BRAND_LOOKUP": [ - "agoricNames", - "oracleBrand", - "USD" - ], - "OUT_BRAND_DECIMALS": 4 - } - ] - }, - { - "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js", - "entrypoint": "defaultProposalBuilder", - "args": [ + "module": "@agoric/builders/scripts/inter-protocol/price-feed-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "contractTerms": { + "POLL_INTERVAL": 30, + "maxSubmissionCount": 1000, + "minSubmissionCount": 3, + "restartDelay": 1, + "timeout": 10, + "minSubmissionValue": 1, + "maxSubmissionValue": 9007199254740991 + }, + "AGORIC_INSTANCE_NAME": "ATOM-USD price feed", + "oracleAddresses": [ + "agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk", + "agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf", + "agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft", + "agoric1ra0g6crtsy6r3qnpu7ruvm7qd4wjnznyzg5nu4", + "agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82" + ], + "IN_BRAND_LOOKUP": [ + "agoricNames", + "oracleBrand", + "ATOM" + ], + "IN_BRAND_DECIMALS": 6, + "OUT_BRAND_LOOKUP": [ + "agoricNames", + "oracleBrand", + "USD" + ], + "OUT_BRAND_DECIMALS": 4 + } + ] + }, { - "voterAddresses": { - "gov1": "agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce", - "gov2": "agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang", - "gov3": "agoric1w8wktaur4zf8qmmtn3n7x3r0jhsjkjntcm3u6h" - } + "module": "@agoric/builders/scripts/inter-protocol/invite-committee-core.js", + "entrypoint": "defaultProposalBuilder", + "args": [ + { + "voterAddresses": { + "gov1": "agoric1ldmtatp24qlllgxmrsjzcpe20fvlkp448zcuce", + "gov2": "agoric140dmkrz2e42ergjj7gyvejhzmjzurvqeq82ang", + "gov3": "agoric1w8wktaur4zf8qmmtn3n7x3r0jhsjkjntcm3u6h" + } + } + ] } ] - } - ], + ] + }, "vats": { "bootstrap": { "sourceSpec": "@agoric/vats/src/core/boot-chain.js",