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.

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

Cherry-pick sequential core proposals and create-dapp #8842

Merged
merged 32 commits into from
Feb 1, 2024

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Jan 30, 2024

Description

Follow up to #8747 and #8743, cherry-picking some more recent changes from the master branch slated for inclusion in the upgrade-14 release. In particular:

Constructed using the following rebase-todo:

# Branch Agoric-mfig-vm-action-defaults
label base-Agoric-mfig-vm-action-defaults
pick a710d6851 feat(cosmos): impose defaults when sending VM actions
pick 021fd0f98 refactor(cosmos): rely on contextual defaults for VM actions
label Agoric-mfig-vm-action-defaults
reset base-Agoric-mfig-vm-action-defaults
merge -C 75ef233ca Agoric-mfig-vm-action-defaults # Merge pull request #8703 from Agoric/mfig-vm-action-defaults

# Branch Agoric-mfig-core-proposal-deps
label base-Agoric-mfig-core-proposal-deps
pick 74f17ee3d feat(extract-proposal): organize proposals into steps
pick 80fa3d144 feat: support `coreProposals.steps`
pick bf8b86f4c chore(cosmic-swingset): `coreProposals.steps` demo
pick 2b38ebc37 fix(cosmic-swingset): merge `coreProposals` from bootstrap and upgrade plan
label Agoric-mfig-core-proposal-deps
reset base-Agoric-mfig-core-proposal-deps
merge -C 09e90eeb9 Agoric-mfig-core-proposal-deps # Merge pull request #8370 from Agoric/mfig-core-proposal-deps

# Branch Agoric-mfig-create-dapp
label base-Agoric-mfig-create-dapp
pick d557a6f21 feat(create-dapp): `npm create @agoric/dapp ...` uses `agoric init`
pick ba9da438f test(create-dapp): basic init flags sanity test
pick 987d6a553 build(xsnap): detect production mode by absence of `test` dir, not `git status`
pick 0800b1e50 fix(agoric-cli): `open` should default to `localhost`, not numeric IPv4
pick e15fc21cb build(agoric-cli): add `tools` subdir to NPM
label Agoric-mfig-create-dapp
reset base-Agoric-mfig-create-dapp
merge -C d127d1db Agoric-mfig-create-dapp # Merge pull request #8530 from Agoric/mfig-create-dapp

# Branch Agoric-8795-pull-create-dapp-into-master
label base-Agoric-8795-pull-create-dapp-into-master
pick 9864bc1a6 docs(create-dapp): update url for getting started
pick 5df669baf chores(create-dapp): update changelog
fixup c3ef51cc3 Remove the "upcoming release" part of the Changelog changes
# pick ecd435e2e chore(xsnap): Match version of @agoric/xsnap to what's on master
edit feaeef6ab chore(create-dapp): match dependency version to current version of agoric-cli # edit to match agoric-cli package version
# pick ae2e30be1 chore(create-dapp): update devDependencies to match other packages
# pick 0d5937640 chore(create-dapp): bump version to 0.2.0
pick f528ba05e chore(create-dapp): remove unused dependency
# pick 9743db8e2 Revert "chore(create-dapp): bump version to 0.2.0"
label Agoric-8795-pull-create-dapp-into-master
reset base-Agoric-8795-pull-create-dapp-into-master
merge -C 2c609b84d Agoric-8795-pull-create-dapp-into-master # Merge pull request #8799 from Agoric/8795-pull-create-dapp-into-master

# Pull Request #8815
edit c132a3157 fix(vats): include index.js in NPM package (#8815) # edit to add back "*.json" in vats package.json

# Pull Request #8827
pick 72d3ed240 chore(internal): Remove unused ENACTED_UPGRADE action type (#8827)

# Pull Request #8828
pick b233223e9 ci: add `dev-` branches as supported PR target (#8828)

# Pull Request #8630
pick 1108cfdbe fix: use dapp-offer-up by default (#8630)

# Branch Agoric-ta-bump-asynth
label base-Agoric-ta-bump-asynth
pick 28b2f9085 chore(deps): bump @agoric/synthetic-chain
pick de95d22d7 feat: delegate synthetic-chain cmds
pick 783f7e84e ci: use a3p-integration cmds
pick 09c585a02 test(upgrade-next): bump synthetic-chain dep
pick 9b94cda8f test: use Yarn v4 for a3p-integration
label Agoric-ta-bump-asynth
reset base-Agoric-ta-bump-asynth
merge -C 014290682 Agoric-ta-bump-asynth # Merge pull request #8839 from Agoric/ta/bump-asynth

# Branch Agoric-mhofman-8843-core-proposal-upgrade-handler
label base-Agoric-mhofman-8843-core-proposal-upgrade-handler
pick b801d2649 chore(deploy-script-support): explicit SequentialCoreProposals type
pick 605eb4b8f feat(cosmos): support core proposals set by upgrade handler
label Agoric-mhofman-8843-core-proposal-upgrade-handler
reset base-Agoric-mhofman-8843-core-proposal-upgrade-handler
merge -C a253f7472 Agoric-mhofman-8843-core-proposal-upgrade-handler # Merge pull request #8844 from Agoric/mhofman/8843-core-proposal-upgrade-handler

Security Considerations

None

Scaling Considerations

None

Documentation Considerations

The documentation for Getting started will be updated after release

Testing Considerations

Existing CI, plus upcoming manual testing of combined wallet factory and zoe upgrades in a single chain software upgrade

Upgrade Considerations

In support of upgrade-14

@mhofman mhofman added the force:integration Force integration tests to run on PR label Jan 30, 2024
@mhofman mhofman changed the title Mhofman/some upgrade 14 cherry pick Cherry-pick sequential core proposals and create-dapp Jan 30, 2024
@mhofman mhofman force-pushed the mhofman/some-upgrade-14-cherry-pick branch from 31665db to 4b0644c Compare January 30, 2024 18:24
@mhofman mhofman mentioned this pull request Jan 30, 2024
michaelfig and others added 20 commits January 30, 2024 23:24
feat(extract-proposal): organize proposals into steps
feat(create-dapp): `npm create @agoric/dapp ...` uses `agoric init`
feat: pull `create-dapp`, `xsnap`, and `agoric-cli` changes from release-getting-started branch
mhofman and others added 4 commits January 30, 2024 23:27
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* use dapp-game-pieces (in agoric-labs) by default

* feat: use dapp-offer-up in @agoric/dapp

* fix(integration-test): update initOptions with '--dapp-template' parameter

* fix(integration-test): set --dapp-template at registry.sh level

* Revert "fix(integration-test): update initOptions with '--dapp-template' parameter"

This reverts commit 2097951.

* Revert "fix(integration-test): set --dapp-template at registry.sh level"

This reverts commit 8ec4ed3.

* fix(integration-test): add --dapp-template parameter to myMain command

* fixup! fix(integration-test): add --dapp-template parameter to myMain command

---------

Co-authored-by: Luqi Pan <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@mhofman mhofman marked this pull request as ready for review January 31, 2024 22:14
Copy link
Member

@gibson042 gibson042 left a comment

Choose a reason for hiding this comment

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

The inclusions look reasonable, and I was able to reproduce the branch state with the documented git rebase todo. 👍

@mhofman mhofman merged commit 1eb5b91 into dev-upgrade-14 Feb 1, 2024
69 of 74 checks passed
@mhofman mhofman deleted the mhofman/some-upgrade-14-cherry-pick branch February 1, 2024 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants