feat: upgrade walletFactory to go beyond vbank assets #8147
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /** | ||
| * @file Proposal Builder: Start Game with non-vbank Place NFT asset | ||
| * | ||
| * Usage: | ||
| * agoric run build-game1-start.js | ||
| */ | ||
|
|
||
| import { makeHelpers } from '@agoric/deploy-script-support'; | ||
| import { getManifestForGame1 } from '@agoric/smart-wallet/test/start-game1-proposal.js'; | ||
|
|
||
| /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */ | ||
| export const game1ProposalBuilder = async ({ publishRef, install }) => { | ||
| return harden({ | ||
| sourceSpec: '@agoric/smart-wallet/test/start-game1-proposal.js', | ||
| getManifestCall: [ | ||
| getManifestForGame1.name, | ||
| { | ||
| game1Ref: publishRef( | ||
| install( | ||
| '@agoric/smart-wallet/test/gameAssetContract.js', | ||
| '../bundles/bundle-game1.js', | ||
| { persist: true }, | ||
| ), | ||
| ), | ||
| }, | ||
| ], | ||
| }); | ||
| }; | ||
|
|
||
| /** @type {DeployScriptFunction} */ | ||
| export default async (homeP, endowments) => { | ||
| const { writeCoreProposal } = await makeHelpers(homeP, endowments); | ||
| await writeCoreProposal('start-game1', game1ProposalBuilder); | ||
| }; |
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,35 @@ | ||
| /** | ||
| * @file Proposal Builder: Upgrade walletFactory | ||
| * | ||
| * Usage: | ||
| * agoric run build-walletFactory-upgrade.js | ||
| */ | ||
|
|
||
| import { makeHelpers } from '@agoric/deploy-script-support'; | ||
| import { getManifestForUpgrade } from '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js'; | ||
|
|
||
| /** @type {import('@agoric/deploy-script-support/src/externalTypes.js').ProposalBuilder} */ | ||
| export const defaultProposalBuilder = async ({ publishRef, install }) => { | ||
| return harden({ | ||
| sourceSpec: | ||
| '@agoric/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js', | ||
| getManifestCall: [ | ||
| getManifestForUpgrade.name, | ||
| { | ||
| walletFactoryRef: publishRef( | ||
| install( | ||
| '@agoric/smart-wallet/src/walletFactory.js', | ||
| '../bundles/bundle-walletFactory.js', | ||
| { persist: true }, | ||
| ), | ||
| ), | ||
| }, | ||
| ], | ||
| }); | ||
| }; | ||
|
|
||
| /** @type {DeployScriptFunction} */ | ||
| export default async (homeP, endowments) => { | ||
| const { writeCoreProposal } = await makeHelpers(homeP, endowments); | ||
| await writeCoreProposal('upgrade-walletFactory', defaultProposalBuilder); | ||
| }; |
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,2 @@ | ||
| upgrade-walletFactory-permit.json | ||
| upgrade-walletFactory.js | ||
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,16 @@ | ||
| #!/bin/bash | ||
|
|
||
| if [ -z "$GOV1ADDR" ]; then | ||
| echo run env_setup.sh to set GOV1ADDR | ||
| exit 1 | ||
| fi | ||
|
|
||
| micro=000000 | ||
|
|
||
| # send some collateral to gov1 | ||
| agd tx bank send validator $GOV1ADDR 20123$micro${ATOM_DENOM} \ | ||
| --keyring-backend=test --chain-id=agoriclocal --yes -bblock -o json | ||
|
|
||
| export PATH=/usr/src/agoric-sdk/packages/agoric-cli/bin:$PATH | ||
| agops vaults open --giveCollateral 5000 --wantMinted 20000 > /tmp/offer.json | ||
| agops perf satisfaction --executeOffer /tmp/offer.json --from gov1 --keyring-backend=test |
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,41 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| import fs from 'fs'; | ||
|
|
||
| const Fail = (template, ...args) => { | ||
| throw Error(String.raw(template, ...args.map(val => String(val)))); | ||
| }; | ||
|
|
||
| /** | ||
| * Parse output of `agoric run proposal-builder.js` | ||
|
There was a problem hiding this comment. An alternative is to teach There was a problem hiding this comment. Maybe someday. For testing purposes I think we'd just add a parse-smart version to |
||
| * | ||
| * @param {string} txt | ||
| * | ||
| * adapted from packages/boot/test/bootstrapTests/supports.js | ||
| */ | ||
| const parseProposalParts = txt => { | ||
| const evals = [ | ||
| ...txt.matchAll(/swingset-core-eval (?<permit>\S+) (?<script>\S+)/g), | ||
| ].map(m => { | ||
| if (!m.groups) throw Fail`Invalid proposal output ${m[0]}`; | ||
| const { permit, script } = m.groups; | ||
| return { permit, script }; | ||
| }); | ||
| evals.length || Fail`No swingset-core-eval found in proposal output: ${txt}`; | ||
|
|
||
| const bundles = [...txt.matchAll(/swingset install-bundle @([^\n]+)/gm)].map( | ||
| ([, bundle]) => bundle, | ||
| ); | ||
| bundles.length || Fail`No bundles found in proposal output: ${txt}`; | ||
|
|
||
| return { evals, bundles }; | ||
| }; | ||
|
|
||
| const main = (stdin, readFileSync) => { | ||
| const input = readFileSync(stdin.fd).toString(); | ||
| const parts = parseProposalParts(input); | ||
| // relies on console.log printing to stdout unmodified | ||
| console.log(JSON.stringify(parts)); | ||
| }; | ||
|
|
||
| main(process.stdin, fs.readFileSync); | ||
File renamed without changes.
|
There was a problem hiding this comment. remark: will be totally refactored after #8237 |
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,116 @@ | ||
| /* eslint-disable @jessie.js/safe-await-separator */ | ||
| /* global process */ | ||
| import assert from 'assert'; | ||
| import { execFile } from 'child_process'; | ||
|
|
||
| const ISTunit = 1_000_000n; // aka displayInfo: { decimalPlaces: 6 } | ||
| const CENT = ISTunit / 100n; | ||
|
|
||
| const [_node, _script, ...choices] = process.argv; | ||
|
|
||
| const toSec = ms => BigInt(Math.round(ms / 1000)); | ||
|
|
||
| const id = `join-${Date.now()}`; | ||
|
|
||
| // look up boardIDs for brands, instances in agoricNames | ||
|
|
||
| // poor-man's zx | ||
| const $ = cmd => { | ||
| console.error(cmd); | ||
| const [file, ...args] = cmd.split(' '); | ||
|
|
||
| return new Promise((resolve, reject) => { | ||
| execFile(file, args, { encoding: 'utf8' }, (err, out) => { | ||
| if (err) return reject(err); | ||
| resolve(out); | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| const zip = (xs, ys) => xs.map((x, i) => [x, ys[i]]); | ||
| const fromSmallCapsEntries = txt => { | ||
| const { body, slots } = JSON.parse(txt); | ||
| const theEntries = zip(JSON.parse(body.slice(1)), slots).map( | ||
| ([[name, ref], boardID]) => { | ||
| const iface = ref.replace(/^\$\d+\./, ''); | ||
|
There was a problem hiding this comment. this has got poor-man's-smallcaps-decoding mixed in. The smallcaps-related hacks could at least be moved into the |
||
| return [name, { iface, boardID }]; | ||
| }, | ||
| ); | ||
| return Object.fromEntries(theEntries); | ||
| }; | ||
|
|
||
| const wkInstance = fromSmallCapsEntries( | ||
| await $('agoric follow -lF :published.agoricNames.instance -o text'), | ||
| ); | ||
| assert(wkInstance.VaultFactory); | ||
|
|
||
| const wkBrand = fromSmallCapsEntries( | ||
| await $('agoric follow -lF :published.agoricNames.brand -o text'), | ||
| ); | ||
| assert(wkBrand.IST); | ||
| assert(wkBrand.Place); | ||
|
|
||
| const slots = []; // XXX global mutable state | ||
|
|
||
| // XXX should use @endo/marshal | ||
| const smallCaps = { | ||
| Nat: n => `+${n}`, | ||
| replacer: (k, v) => | ||
| typeof v === 'bigint' | ||
| ? `+${v}` | ||
| : typeof v === 'symbol' | ||
| ? `%${v.description}` | ||
| : v, | ||
| // XXX mutates obj | ||
| ref: obj => { | ||
| if (obj.ix) return obj.ix; | ||
| const ix = slots.length; | ||
| slots.push(obj.boardID); | ||
| obj.ix = `$${ix}.Alleged: ${obj.iface}`; | ||
| return obj.ix; | ||
| }, | ||
| }; | ||
|
|
||
| const AmountMath = { | ||
| make: (brand, value) => ({ | ||
| brand: smallCaps.ref(brand), | ||
| value: typeof value === 'bigint' ? smallCaps.Nat(value) : value, | ||
| }), | ||
| }; | ||
|
|
||
| const makeTagged = (tag, payload) => ({ | ||
| '#tag': tag, | ||
| payload, | ||
| }); | ||
|
|
||
| const makeCopyBag = entries => makeTagged('copyBag', entries); | ||
| const want = { | ||
| Places: AmountMath.make( | ||
| wkBrand.Place, | ||
| makeCopyBag(choices.map(name => [name, 1n])), | ||
| ), | ||
| }; | ||
|
|
||
| const give = { Price: AmountMath.make(wkBrand.IST, 25n * CENT) }; | ||
| const body = { | ||
| method: 'executeOffer', | ||
| offer: { | ||
| id, | ||
| invitationSpec: { | ||
| source: 'contract', | ||
| instance: smallCaps.ref(wkInstance.game1), | ||
| publicInvitationMaker: 'makeJoinInvitation', | ||
| }, | ||
| proposal: { give, want }, | ||
| }, | ||
| }; | ||
|
|
||
| console.error(JSON.stringify(body.offer, smallCaps.replacer, 1)); | ||
|
|
||
| const capData = { | ||
| body: `#${JSON.stringify(body, smallCaps.replacer)}`, | ||
| slots, | ||
| }; | ||
| const action = JSON.stringify(capData); | ||
|
|
||
| console.log(action); | ||
Oops, something went wrong.
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.
question: should we have a global gitignore on
-permit.json? if so, should we name them.permit.jsonto hint that it's a kind of thing?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.
It is a kind of thing. (There's a static type and could be a pattern). So I'd support renaming all of them together in a separate PR.
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.
#8249, draft until this one lands