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

rebase/cherry-pick commits for upgrade 11 #8159

Merged
merged 139 commits into from
Aug 24, 2023

Conversation

mhofman
Copy link
Member

@mhofman mhofman commented Aug 7, 2023

This is a PR staging rebases of some master PRs towards an upgrade-11.

It was performed with the following interactive rebase onto the release-mainnet1B branch:

# Branch Agoric-raph-ut-env-refactor
label base-Agoric-raph-ut-env-refactor
pick 98ea55708 upgrade-test: isolate vaults-and-beyond env setup
label Agoric-raph-ut-env-refactor
reset base-Agoric-raph-ut-env-refactor
merge -C 3ae8bfcad Agoric-raph-ut-env-refactor # Merge pull request #7802 from Agoric/raph/ut-env-refactor

# Branch Agoric-raph-tmux-flags
label base-Agoric-raph-tmux-flags
pick ef92fb5cc feat: allow passing tmux flags
pick 9540b7b43 upgrade-test: tmux flag docs
pick e392bd434 Update Readme.md
label Agoric-raph-tmux-flags
reset base-Agoric-raph-tmux-flags
merge -C 056a0640a Agoric-raph-tmux-flags # Merge pull request #7792 from Agoric/raph/tmux-flags

# Branch Agoric-mfig-relocatable-addon
label base-Agoric-mfig-relocatable-addon
pick ed9d1f4a0 build(cosmos): make Node.js addon tolerate relocation
pick a2f83c4f3 chore(golang): move all Go files to `cosmos/golang`
pick dd547f0a8 feat(agd): try harder to find cosmic-swingset
pick e972f39fc ci(restore-golang): adjust path to `**/go.sum`
pick ba6e3c1a5 ci(golangci-lint): implement depguard fix and adjust paths
pick 981752c3c ci(deployment): fix paths for local validator instance
label Agoric-mfig-relocatable-addon
reset base-Agoric-mfig-relocatable-addon
merge -C 4989f2675 Agoric-mfig-relocatable-addon # Merge pull request #7865 from Agoric/mfig-relocatable-addon

# Branch Agoric-better-xsnap-version-check
label base-Agoric-better-xsnap-version-check
pick b69aa8f0c chore(bin/agd): get expected xsnap version from repoconfig.sh
label Agoric-better-xsnap-version-check
reset base-Agoric-better-xsnap-version-check
merge -C 9546eb3e5 Agoric-better-xsnap-version-check # Merge pull request #7881 from Agoric/better-xsnap-version-check

# Branch Agoric-dc-deliver-inbound-discard-test
label base-Agoric-dc-deliver-inbound-discard-test
pick 43fb97b33 test: DeliverInbound from un-provisioned account is discarded
label Agoric-dc-deliver-inbound-discard-test
reset base-Agoric-dc-deliver-inbound-discard-test
merge -C 3f11ae428 Agoric-dc-deliver-inbound-discard-test # Merge pull request #7923 from Agoric/dc-deliver-inbound-discard-test

# Branch Agoric-mfig-build-tweaks
label base-Agoric-mfig-build-tweaks
pick 59aedf9ee build(xsnap): rebuild on postinstall
pick 47a95fcef build(cosmos): clarify `install_name_tool` postbuild name
pick 6866ebe67 build!: remove deprecated `ag-cosmos-helper`
label Agoric-mfig-build-tweaks
reset base-Agoric-mfig-build-tweaks
merge -C f581a7ec1 Agoric-mfig-build-tweaks # Merge pull request #7927 from Agoric/mfig-build-tweaks

# Branch Agoric-mfig-specify-debian-version
label base-Agoric-mfig-specify-debian-version
pick d22f5bedf build(deployment): use `bullseye` until `bookworm` bakes a bit
pick ba2c754be fix(deployment): map Debian `bookworm` to Ubuntu `jammy`
pick 20c270206 build(deployment): pin docker to explicit `node:18`
label Agoric-mfig-specify-debian-version
reset base-Agoric-mfig-specify-debian-version
merge -C ff36f02c5 Agoric-mfig-specify-debian-version # Merge pull request #7948 from Agoric/mfig-specify-debian-version

# Branch Agoric-raph-ut-target-steps
label base-Agoric-raph-ut-target-steps
pick 8754b0946 upgrade-test: split upgrade steps and tag
label Agoric-raph-ut-target-steps
reset base-Agoric-raph-ut-target-steps
merge -C 5736604bb Agoric-raph-ut-target-steps # Merge pull request #7835 from Agoric/raph/ut-target-steps

# Branch Agoric-mfig-bridge-no-error-stack
label base-Agoric-mfig-bridge-no-error-stack
pick 58acca7bf test(cosmos): demonstrate Golang error frame divergence
pick 3390d902f fix(cosmos): prevent Golang error wrapping stack frame divergence
pick 49d37b3c6 test(cosmos): ensure sdkerrors do not leak stack by default
pick eaffc1b12 ci(cosmos): forbid `%w` error-wrapping format specifier
label Agoric-mfig-bridge-no-error-stack
reset base-Agoric-mfig-bridge-no-error-stack
merge -C c50674b3c Agoric-mfig-bridge-no-error-stack # Merge pull request #7930 from Agoric/mfig-bridge-no-error-stack

# Branch Agoric-mfig-i-can-haz-builtin
label base-Agoric-mfig-i-can-haz-builtin
pick 8c0a9a408 test(xsnap): check trivial snapshot golden hashes
pick a2b48e179 build(xsnap): use `-D__has_builtin(x)=1` to avoid divergence
label Agoric-mfig-i-can-haz-builtin
reset base-Agoric-mfig-i-can-haz-builtin
merge -C a6737cdba Agoric-mfig-i-can-haz-builtin # Merge pull request #7836 from Agoric/mfig-i-can-haz-builtin

# Branch Agoric-raph-upgrade-tests-tagging
label base-Agoric-raph-upgrade-tests-tagging
pick 7bbe44fd7 fix: use dev instead of latest
pick c4a67f268 github action uses locally built latest
pick a227d3e0c update docs
label Agoric-raph-upgrade-tests-tagging
reset base-Agoric-raph-upgrade-tests-tagging
merge -C aa8b3a119 Agoric-raph-upgrade-tests-tagging # Merge pull request #7745 from Agoric/raph/upgrade-tests-tagging

# Branch Agoric-raph-fix-dest-ci
label base-Agoric-raph-fix-dest-ci
pick 5fc741ab6 upgrade-test: do not overwrite DEST_IMAGE when set
label Agoric-raph-fix-dest-ci
reset base-Agoric-raph-fix-dest-ci
merge -C 6c6b5a02d Agoric-raph-fix-dest-ci # Merge pull request #7997 from Agoric/raph/fix-dest-ci

# Branch Agoric-gibson-2023-07-make-cosmos-aarch64
label base-Agoric-gibson-2023-07-make-cosmos-aarch64
pick ff2e5ed20 fix(cosmos): Support building on Linux aarch64
label Agoric-gibson-2023-07-make-cosmos-aarch64
reset base-Agoric-gibson-2023-07-make-cosmos-aarch64
merge -C 5382a55a0 Agoric-gibson-2023-07-make-cosmos-aarch64 # Merge pull request #8029 from Agoric/gibson-2023-07-make-cosmos-aarch64

# Branch Agoric-7992-enact-upgrade-plan
label base-Agoric-7992-enact-upgrade-plan
pick 6757303fc feat: Cosmos upgrade handler calls swingset
pick e088215a7 fix: test upgrade to one-past-vaults
pick e84ebf2c1 refactor: put upgrade plan in cosmos init action
pick 8d8580a8c refactor: no longer a need for upgrade function to talk over bridge
label Agoric-7992-enact-upgrade-plan
reset base-Agoric-7992-enact-upgrade-plan
merge -C bcca849b8 Agoric-7992-enact-upgrade-plan # Merge pull request #7994 from Agoric/7992-enact-upgrade-plan

# Branch Agoric-mfig-debug-deploy
label base-Agoric-mfig-debug-deploy
pick 52db65e1e ci(deployment-test): remove hardwired /usr/src/agoric-sdk
pick 4d14a2f6c fix(solo): let `init` tolerate existing `html` directory
pick af4784216 feat(deployment): only include this package in `setup` docker image
pick 3d4dd2bc0 feat(deployment): `docker/integration-test.sh` for nested execution
pick 7d435cb42 fix(deployment-integration): reenable DOCKER_VOLUMES
pick 8161c5e24 feat(deployment): find testnet-load-generator in parent of agoric-sdk
pick 2fa06dcc7 fix(scripts): remove new home folder before local deployment test
label Agoric-mfig-debug-deploy
reset base-Agoric-mfig-debug-deploy
merge -C afe8a6e78 Agoric-mfig-debug-deploy # Merge pull request #8004 from Agoric/mfig-debug-deploy

# Branch Agoric-mhofman-refactor-cosmos-init
label base-Agoric-mhofman-refactor-cosmos-init
pick 5412966ae refactor(cosmic-swingset): portNums are static in init
pick b8a817dfa fix(x/vstorage): value can be empty in genesis data
pick deaa061e6 chore(x/vstorage): remove nodata migration logic
pick e7f5b658b fix(cosmos): module order independent init and bootstrap
pick b4dbbf782 chore(cosmic-swingset): check state before snapshot restore
pick 35f03f9f2 fix(x/swingset): enforce snapshot restore before init
pick 554a1102a fix(x/swingset): guard snapshot restore for concurrency
label Agoric-mhofman-refactor-cosmos-init
reset base-Agoric-mhofman-refactor-cosmos-init
merge -C 22cbeb145 Agoric-mhofman-refactor-cosmos-init # Merge pull request #8060 from Agoric/mhofman/refactor-cosmos-init

# Branch Agoric-mhofman-fix-deployment-ci-loadgen
label base-Agoric-mhofman-fix-deployment-ci-loadgen
pick 9b9b35ef1 fix(ci): checkout agoric-sdk in sub folder Restore loadgen in deployment test
pick a59f16200 fix(ci): require loadgen in deployment integration test
pick ea7e883f4 fix(deployment): propagate `ag-setup-cosmos` path to faucet script remove remnants of `ag-setup-cosmos` symlink
pick 680c01aac ci(deployment-test): separate network and SDK dirs
label Agoric-mhofman-fix-deployment-ci-loadgen
reset base-Agoric-mhofman-fix-deployment-ci-loadgen
merge -C 8bcf6af10 Agoric-mhofman-fix-deployment-ci-loadgen # Merge pull request #8085 from Agoric/mhofman/fix-deployment-ci-loadgen

# Branch Agoric-mhofman-fix-controller-init-upgrade
label base-Agoric-mhofman-fix-controller-init-upgrade
pick b4260afd1 fix(cosmos): don't init controller before upgrade
pick e7cd76222 refactor(cosmic-swingset): consolidate init and bootstrap
pick 655133ed9 feat(cosmic-swingset): add JS upgrade plan handler stub
pick 2e06f2558 refactor(cosmic-swingset): factor out common blockingSend steps
label Agoric-mhofman-fix-controller-init-upgrade
reset base-Agoric-mhofman-fix-controller-init-upgrade
merge -C f84ea2e16 Agoric-mhofman-fix-controller-init-upgrade # Merge pull request #8106 from Agoric/mhofman/fix-controller-init-upgrade

# Branch Agoric-mhofman-8081-replicate-state-sync-issue
label base-Agoric-mhofman-8081-replicate-state-sync-issue
pick b9d4b6512 refactor(deployment): upgrade test provide agd commands
pick b06beec9e feat(deployment): replicate broken state sync in upgrade test
label Agoric-mhofman-8081-replicate-state-sync-issue
reset base-Agoric-mhofman-8081-replicate-state-sync-issue
merge -C 52c75d4b5 Agoric-mhofman-8081-replicate-state-sync-issue # Merge pull request #8107 from Agoric/mhofman/8081-replicate-state-sync-issue

# Branch Agoric-mhofman-refactor-snapshotter
label base-Agoric-mhofman-refactor-snapshotter
pick bc6d9b6b6 refactor(cosmos): rename snapshot artifact protobuf
pick 866637cc5 refactor(x/swingset): consistent height handling in snapshotter
pick a3def03f2 chore(x/swingset): remove disabled restore using untrusted data
pick 2cd3d08fe chore(x/swingset): better handle snapshot retrieve errors
pick f632d2b2d chore: add sequence diagrams of state-sync process
pick 23aad6cbd refactor(x/swingset): better export js-golang interface types
pick 17b7558ef chore(x/swingset): update some godoc
pick 05bbee539 feat(x/swingset): add WaitUntilSwingStoreExportDone
pick 62eb71de7 refactor(x/swingset): split snapshotter
label base-Merge-split-of-snapshotter-go
# Merge-split-of-snapshotter-go
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
pick b7bb06c35 chore(x/swingset): rename to extension_snapshotter.go
pick d42c2cac9 chore(x/swingset): remove SwingStoreExportsHandler from extension_snapshotter.go
label Merge-split-of-snapshotter-go
# Merge-split-of-snapshotter-go-2
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
pick a73868b01 chore(x/swingset): rename to swing_store_exports_handler.go
pick 757557c49 chore(x/swingset): remove ExtensionSnapshotter from swing_store_exports_handler.go
label Merge-split-of-snapshotter-go-2
# Continuation of Agoric-mhofman-refactor-snapshotter
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
merge -C be6bab230 Merge-split-of-snapshotter-go Merge-split-of-snapshotter-go-2 # Merge split of snapshotter.go
pick a1290eff7 feat(x/swingset): allow taking snapshot latest height
pick ead6730a3 chore(cosmic-swingset): thread snapshot options through
label Agoric-mhofman-refactor-snapshotter
reset base-Agoric-mhofman-refactor-snapshotter
merge -C 3679b4c27 Agoric-mhofman-refactor-snapshotter # Merge pull request #8072 from Agoric/mhofman/refactor-snapshotter

# Branch Agoric-8025-swingstore-missing-metadata
label base-Agoric-8025-swingstore-missing-metadata
pick 08b71f90d refactor(swing-store): refactor swingstore into better pieces
pick 38c9efce1 fix: rewrite importSwingStore to preserve metadata properly
pick 33b5c1c1f feat(swingstore): add repairMetadata()
label Agoric-8025-swingstore-missing-metadata
reset base-Agoric-8025-swingstore-missing-metadata
merge -C 9d4eaadaa Agoric-8025-swingstore-missing-metadata # Merge pull request #8075 from Agoric/8025-swingstore-missing-metadata

# Branch Agoric-raphdev-patch-1
label base-Agoric-raphdev-patch-1
pick 39558c04b fix(upgrade-test): use correct mainnet-1b image
label Agoric-raphdev-patch-1
reset base-Agoric-raphdev-patch-1
merge -C aa10ecdb7 Agoric-raphdev-patch-1 # Merge pull request #8165 from Agoric/raphdev-patch-1

# Branch Agoric-mfig-improve-docker-test
label base-Agoric-mfig-improve-docker-test
pick 5f703d72c feat(upgrade-test): plumb and use `UPGRADE_INFO`
pick 735246a6b fix(upgrade-test): abort if proposal is rejected
pick 524905d6c test(upgrade-test): default init-network core proposal for agoric-upgrade-11
pick 1b23d3112 fix(upgrade-test): use `agoric-upgrade-10` tag 35
pick 844556ba1 fix(upgrade-test): use default `$DEBUG` for docker run
label Agoric-mfig-improve-docker-test
reset base-Agoric-mfig-improve-docker-test
merge -C 2d71c017b Agoric-mfig-improve-docker-test # Merge pull request #8166 from Agoric/mfig-improve-docker-test

# Branch Agoric-mhofman-8031-more-snapshot-logic-refactor
label base-Agoric-mhofman-8031-more-snapshot-logic-refactor
pick 7d3eafaf9 refactor(x/swingset): ReadArtifact -> ReadNextArtifact
pick d92bfb5d9 refactor(x/swingset): create restore context in app
pick e0c018616 refactor(cosmos): shared KVEntry
pick 1bba8592e feat(cosmos): KVEntry implements json Marshaler and Unmarshaller
pick 027e8a2c9 refactor(cosmos): add KVEntry helpers
pick 6c3d70993 refactor(x/swingset): switch to KVEntryReader for export data
label Agoric-mhofman-8031-more-snapshot-logic-refactor
reset base-Agoric-mhofman-8031-more-snapshot-logic-refactor
merge -C d6bb5643d Agoric-mhofman-8031-more-snapshot-logic-refactor # Merge pull request #8175 from Agoric/mhofman/8031-more-snapshot-logic-refactor

# Branch Agoric-mhofman-8031-swing-store-sync-refactor
label base-Agoric-mhofman-8031-swing-store-sync-refactor
pick ea582bf77 feat(cosmos): wire new swingset port handler
pick 1534adde5 feat(cosmic-swingset): use x/swingset for swing-store export data
pick 9df85cf49 feat(x/swingset): add store data to genesis
label Agoric-mhofman-8031-swing-store-sync-refactor
reset base-Agoric-mhofman-8031-swing-store-sync-refactor
merge -C fed2b5e46 Agoric-mhofman-8031-swing-store-sync-refactor # Merge pull request #8043 from Agoric/mhofman/8031-swing-store-sync-refactor

# Branch Agoric-8105-export-mode-replay
label base-Agoric-8105-export-mode-replay
pick 9939ea699 fix(swing-store): add 'replay' artifactMode, make export more strict
pick bd49484e5 fix(cosmic-swingset): backwards param compat in import/export
label Agoric-8105-export-mode-replay
reset base-Agoric-8105-export-mode-replay
merge -C c6d8a278a Agoric-8105-export-mode-replay # Merge pull request #8170 from Agoric/8105-export-mode-replay

# Branch Agoric-mhofman-8081-fix-state-sync
label base-Agoric-mhofman-8081-fix-state-sync
pick 0f01712ca feat(cosmic-swingset): replace import/export options
pick 6ab24b299 fix(x/swingset): switch export/import to replay artifact level
pick b4f3e2245 chore(x/vstorage): add remove entries method
pick 4fc01134f feat(cosmic-swingset): add repair-metadata snapshot restore option
pick a0389b887 feat(cosmos): fix and migrate swing-store
pick 38ac134e3 feat(deployment): add state-sync to upgrade 11 test
label Agoric-mhofman-8081-fix-state-sync
reset base-Agoric-mhofman-8081-fix-state-sync
merge -C f2445bcb4 Agoric-mhofman-8081-fix-state-sync # Merge pull request #8143 from Agoric/mhofman/8081-fix-state-sync

pick 8d742f418 ci(test-docker-build): try making more free disk space

# Branch Agoric-agoric-11-test-on-10
label base-Agoric-agoric-11-test-on-10
pick 891f372bb test: add tests from agoric-upgrade-10 to agoric-upgrade-11
label Agoric-agoric-11-test-on-10
reset base-Agoric-agoric-11-test-on-10
merge -C 61b6c39a7 Agoric-agoric-11-test-on-10 # Merge pull request #8213 from Agoric/agoric-11-test-on-10

# Branch Agoric-mhofman-6527-genesis-with-swing-store
label base-Agoric-mhofman-6527-genesis-with-swing-store
pick 7a4fa83ce refactor(x/swingset): explicit read/write swing-store export directory
pick 33c4a517f fix(cosmic-swingset): log level for swing-store export
pick 592948dc2 feat(cosmos): spawn JS on export command
pick 3be298605 feat(cosmos)!: add required export-dir export cmd option
pick 598abf73a feat(x/swingset): export swing store in genesis
pick 55ba7f6c3 feat(x/swingset): import swing store from genesis state
pick 46d34667c feat(deployment): add genesis export test
label Agoric-mhofman-6527-genesis-with-swing-store
reset base-Agoric-mhofman-6527-genesis-with-swing-store
merge -C 9048d655c Agoric-mhofman-6527-genesis-with-swing-store # Merge pull request #8152 from Agoric/mhofman/6527-genesis-with-swing-store

and some minor conflict resolutions

@mhofman
Copy link
Member Author

mhofman commented Aug 8, 2023

for my record, some Regexp search/replace I used to make it from the git rebase -i --rebase-merges to the git-rebase-todo above: s/# Branch (.*)\n((?:[^\n]+\n)+)/# Branch $1\nlabel base-$1\n$2reset base-$1\n/g

@mhofman
Copy link
Member Author

mhofman commented Aug 15, 2023

outdated comment, rolled into original post

michaelfig and others added 28 commits August 16, 2023 20:47
upgrade-test: isolate vaults-and-beyond env setup
feat(upgrade-test): allow passing tmux flags
instead of using a baked-in constant. Thanks to mfig for the
suggestion.
build(cosmos): make Node.js addon tolerate relocation
chore(bin/agd): get expected xsnap version from repoconfig.sh
test: DeliverInbound from un-provisioned account is discarded
build!: remove deprecated `ag-cosmos-helper`
@mhofman mhofman force-pushed the mhofman/rebase-for-upgrade11 branch from 6f5b7b8 to 99a6425 Compare August 16, 2023 20:54
michaelfig and others added 12 commits August 16, 2023 21:41
Do not assume deamonization
Adding coverage of metrics produced in agoric-upgrade-10 on agoric-upgrade
…store

feat(x/swingset): include swing-store in genesis
…ereleases

(cherry-picked from commit b1917d6
from trunk, contained in PR #8243)

We used to patch this library to reduce the `releaseType` level for
our packages that had not yet reached 1.0 . We then switched to an
upstream version which performed this reduction itself, except not
when doing a "prerelease". Now that we need to do a prerelease, we'd
like this reduction behavior in both arms of the conditional, so this
commit re-introduces our original patch.

refs #8242
@warner warner marked this pull request as ready for review August 24, 2023 01:13
@warner warner self-requested a review August 24, 2023 01:13
Copy link
Member

@warner warner left a comment

Choose a reason for hiding this comment

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

we've done a lot of testing on this branch, and I skimmed the individual commits, so I'm comfortable using this set of patches for the agoric-upgrade11 release

@warner warner changed the title WIP: rebase for upgrade 11 rebase/cherry-pick commits for upgrade 11 Aug 24, 2023
@warner warner merged commit 4580cfc into release-mainnet1B Aug 24, 2023
62 of 63 checks passed
@warner warner deleted the mhofman/rebase-for-upgrade11 branch August 24, 2023 01:28
@mhofman
Copy link
Member Author

mhofman commented Sep 20, 2023

For reference, since I had lost this, here is the non-pruned rebase-todo I used as a source:

rebase-todo
# Branch Agoric-raph-ut-env-refactor
label base-Agoric-raph-ut-env-refactor
pick 98ea55708 upgrade-test: isolate vaults-and-beyond env setup
label Agoric-raph-ut-env-refactor
reset base-Agoric-raph-ut-env-refactor
merge -C 3ae8bfcad Agoric-raph-ut-env-refactor # Merge pull request #7802 from Agoric/raph/ut-env-refactor

# Branch Agoric-raph-tmux-flags
label base-Agoric-raph-tmux-flags
pick ef92fb5cc feat: allow passing tmux flags
pick 9540b7b43 upgrade-test: tmux flag docs
pick e392bd434 Update Readme.md
label Agoric-raph-tmux-flags
reset base-Agoric-raph-tmux-flags
merge -C 056a0640a Agoric-raph-tmux-flags # Merge pull request #7792 from Agoric/raph/tmux-flags

# Branch Agoric-mfig-relocatable-addon
label base-Agoric-mfig-relocatable-addon
pick ed9d1f4a0 build(cosmos): make Node.js addon tolerate relocation
pick a2f83c4f3 chore(golang): move all Go files to `cosmos/golang`
pick dd547f0a8 feat(agd): try harder to find cosmic-swingset
pick e972f39fc ci(restore-golang): adjust path to `**/go.sum`
pick ba6e3c1a5 ci(golangci-lint): implement depguard fix and adjust paths
pick 981752c3c ci(deployment): fix paths for local validator instance
label Agoric-mfig-relocatable-addon
reset base-Agoric-mfig-relocatable-addon
merge -C 4989f2675 Agoric-mfig-relocatable-addon # Merge pull request #7865 from Agoric/mfig-relocatable-addon

# Branch Agoric-mfig-eslint-await-rules
label base-Agoric-mfig-eslint-await-rules
pick 0a1c02c11 chore(eslint): add `safe-await-separator` and tighten rules
pick 8be2e8637 feat(eslint-config): also disable `no-await-in-loop`
pick f7bd48838 build(deps): use new `@jessie.js/eslint-plugin` package
pick 3de0df4e1 chore(eslint): excise `@jessie.js/no-nested-await` and `no-await-in-loop`
pick 310cc8357 chore: fix the lint
pick 94c6b3c83 fix: update for `@jessie.js/safe-await-separator`
pick a21e278ea chore(eslint): set `@jessie.js/safe-await-separator` to `error`
pick 377de7402 ci(restore-golang): avoid double-caching
label Agoric-mfig-eslint-await-rules
reset base-Agoric-mfig-eslint-await-rules
merge -C 9f34f9d4e Agoric-mfig-eslint-await-rules # Merge pull request #7870 from Agoric/mfig-eslint-await-rules

# Branch schnetzlerjoe-master
label base-schnetzlerjoe-master
pick cf7e42ddd Add memo pegasus
pick 91dde1d36 Update packages/pegasus/src/ics20.js
pick 41f91ec60 Update packages/pegasus/src/pegasus.js
pick 98b8a05e7 Update packages/pegasus/src/types.js
pick e6dab51bc Delete files
pick bb8969b8a Add memo to send
pick 8a4455f46 Add empty memo test
pick a45018f29 chore(pegasus): prettier with `yarn format`
label schnetzlerjoe-master
reset base-schnetzlerjoe-master
merge -C 779b73d11 schnetzlerjoe-master # Merge pull request #7079 from schnetzlerjoe/master

# Branch Agoric-mfig-local-npm
label base-Agoric-mfig-local-npm
pick ca530f884 ci(local-npm): resume integration testing of NPM canary
pick b4a598469 build(deps): tweak `package.json`s
pick f33f4e20e chore(telemetry): use newer `@opentelemetry` with matching versions
pick 9364d7d8e build(deps): refresh `yarn.lock`
pick ff85a7af2 fix(deploy-scripts-support): correct bare module resolution
label Agoric-mfig-local-npm
reset base-Agoric-mfig-local-npm
merge -C 33535095a Agoric-mfig-local-npm # Merge pull request #7883 from Agoric/mfig-local-npm

# Branch Agoric-mfig-periodic-endo
label base-Agoric-mfig-periodic-endo
pick 45505c53a ci: schedule nightly test against Endo master
label Agoric-mfig-periodic-endo
reset base-Agoric-mfig-periodic-endo
merge -C 20433496e Agoric-mfig-periodic-endo # Merge pull request #7887 from Agoric/mfig-periodic-endo

# Branch Agoric-7882-endRoundCleanup
label base-Agoric-7882-endRoundCleanup
pick 18a32bcdf fix(auction!): don't reset an auction which is already scheduled
label Agoric-7882-endRoundCleanup
reset base-Agoric-7882-endRoundCleanup
merge -C b020abe99 Agoric-7882-endRoundCleanup # Merge pull request #7886 from Agoric/7882-endRoundCleanup

# Branch Agoric-dc-zoe-system-upgrade
label base-Agoric-dc-zoe-system-upgrade
pick 549955da9 test: zoe null upgrade by swingset.CoreEval governance decision (WIP)
pick 05d602c26 chore: get vat status from kernelDB
pick 5cc5ec883 test: upgrade zoe thru CoreEval
label Agoric-dc-zoe-system-upgrade
reset base-Agoric-dc-zoe-system-upgrade
merge -C 590740f3c Agoric-dc-zoe-system-upgrade # Merge pull request #7793 from Agoric/dc-zoe-system-upgrade

# Branch Agoric-ta-multiple-collats
label base-Agoric-ta-multiple-collats
pick 4f12b72ca test(bootstrap): refactor buildProposal for re-use
pick 10e19d76e feat(proposals): signal of price feed availability
pick daf56fc38 refactor: extract price feed name helper
pick c71145303 chore(vaults): handle missing lockedQuote as valid
pick 247970e95 test(bootstrap): liq after add-collateral
label Agoric-ta-multiple-collats
reset base-Agoric-ta-multiple-collats
merge -C 13050c28e Agoric-ta-multiple-collats # Merge pull request #7892 from Agoric/ta/multiple-collats

# Branch Agoric-sam-rename-interest
label base-Agoric-sam-rename-interest
pick e2964265d feat(inter-protocol)!: rename InterestRate to StabilityFee
pick 21f9ae9f8 feat(inter-protocol)!: rename interestSnapshot, latestInterestUpdate, and compoundedInterest
pick 61b5be82b feat(inter-protocol)!: rename debtSnapshot.interest to stabilityFee
label Agoric-sam-rename-interest
reset base-Agoric-sam-rename-interest
merge -C 69236fdbd Agoric-sam-rename-interest # Merge pull request #7871 from Agoric/sam-rename-interest

# Branch Agoric-ta-ava-5-3
label base-Agoric-ta-ava-5-3
pick 96d81d1be chore(deps): bump AVA to 5.3.0
pick 8307e2340 chore(deps): bump fast-check/ava
label Agoric-ta-ava-5-3
reset base-Agoric-ta-ava-5-3
merge -C 39b15861b Agoric-ta-ava-5-3 # Merge pull request #7896 from Agoric/ta/ava-5.3

# Branch Agoric-mfig-schedule-endo-ci
label base-Agoric-mfig-schedule-endo-ci
pick 15549b529 ci(restore-node): properly use `context.eventName` in script
label Agoric-mfig-schedule-endo-ci
reset base-Agoric-mfig-schedule-endo-ci
merge -C b8d669707 Agoric-mfig-schedule-endo-ci # Merge pull request #7917 from Agoric/mfig-schedule-endo-ci

# Branch Agoric-better-xsnap-version-check
label base-Agoric-better-xsnap-version-check
pick b69aa8f0c chore(bin/agd): get expected xsnap version from repoconfig.sh
label Agoric-better-xsnap-version-check
reset base-Agoric-better-xsnap-version-check
merge -C 9546eb3e5 Agoric-better-xsnap-version-check # Merge pull request #7881 from Agoric/better-xsnap-version-check

# Branch Agoric-lighten-notifier
label base-Agoric-lighten-notifier
pick 3591a6800 build: clean up notifier deps
pick 1ab049437 build: export tools from swingset-liveslots
label Agoric-lighten-notifier
reset base-Agoric-lighten-notifier
merge -C 8c1463229 Agoric-lighten-notifier # Merge pull request #7921 from Agoric/lighten-notifier

# Branch Agoric-dc-deliver-inbound-discard-test
label base-Agoric-dc-deliver-inbound-discard-test
pick 43fb97b33 test: DeliverInbound from un-provisioned account is discarded
label Agoric-dc-deliver-inbound-discard-test
reset base-Agoric-dc-deliver-inbound-discard-test
merge -C 3f11ae428 Agoric-dc-deliver-inbound-discard-test # Merge pull request #7923 from Agoric/dc-deliver-inbound-discard-test

# Branch Agoric-ta-cycle-detection
label base-Agoric-ta-cycle-detection
pick b124a0a3a build: detect cycles in package dependencies
pick 263023890 ci: check dependency cycles
label Agoric-ta-cycle-detection
reset base-Agoric-ta-cycle-detection
merge -C dd19d7941 Agoric-ta-cycle-detection # Merge pull request #7823 from Agoric/ta/cycle-detection

# Branch Agoric-7632-cleanup-virtual-collection-api-surfaces
label base-Agoric-7632-cleanup-virtual-collection-api-surfaces
pick af5507bfe fix: correct infelicities in virtual collection API implementation
pick 0ea5eb3ae fix: add test for collection snapshot
pick 656514e5a fix: kindlier error diagnostics on addAll
pick ca2a15eb5 doc: add NEWS.md to warn about API changes
label Agoric-7632-cleanup-virtual-collection-api-surfaces
reset base-Agoric-7632-cleanup-virtual-collection-api-surfaces
merge -C 6fece09c3 Agoric-7632-cleanup-virtual-collection-api-surfaces # Merge pull request #7668 from Agoric/7632-cleanup-virtual-collection-api-surfaces

# Branch Agoric-markm-ignore-symbol-named-methods
label base-Agoric-markm-ignore-symbol-named-methods
pick 790ad418e test(zoe): ignore symbol-named methods in some tests
label Agoric-markm-ignore-symbol-named-methods
reset base-Agoric-markm-ignore-symbol-named-methods
merge -C d5898733a Agoric-markm-ignore-symbol-named-methods # Merge pull request #7933 from Agoric/markm-ignore-symbol-named-methods

# Branch Agoric-gibson-7931-endo-error-messages
label base-Agoric-gibson-7931-endo-error-messages
pick f9d53d3dc test: Support new error messages from endojs/endo#1606
label Agoric-gibson-7931-endo-error-messages
reset base-Agoric-gibson-7931-endo-error-messages
merge -C 3c781f643 Agoric-gibson-7931-endo-error-messages # Merge pull request #7932 from Agoric/gibson-7931-endo-error-messages

# Branch Agoric-6591-remove-ui
label base-Agoric-6591-remove-ui
pick 5e49f9731 chore: remove deprecated wallet-connection
pick 41356ea64 chore: move web-components to ui-kit repo
pick e80cb72c9 chore: move ui-components to ui-kit repo
pick 9de1544ea chore(deps): yarn-deduplicate
pick f53a82d50 chore(deps): sync lint peerDeps
pick 253cfad92 chore(types): provide accurate defs for 'express'
pick 5a572b47b chore(deps): bump typescript-eslint
pick 379277e77 fix: export of eslint-config.cjs
pick 9b7aa6317 chore(deps): remove react deps
label Agoric-6591-remove-ui
reset base-Agoric-6591-remove-ui
merge -C f8eb1cd71 Agoric-6591-remove-ui # Merge pull request #7922 from Agoric/6591-remove-ui

# Branch Agoric-mfig-build-tweaks
label base-Agoric-mfig-build-tweaks
pick 59aedf9ee build(xsnap): rebuild on postinstall
pick 47a95fcef build(cosmos): clarify `install_name_tool` postbuild name
pick 6866ebe67 build!: remove deprecated `ag-cosmos-helper`
label Agoric-mfig-build-tweaks
reset base-Agoric-mfig-build-tweaks
merge -C f581a7ec1 Agoric-mfig-build-tweaks # Merge pull request #7927 from Agoric/mfig-build-tweaks

# Branch Agoric-mfig-rejected-script-error
label base-Agoric-mfig-rejected-script-error
pick abdab8790 fix: ensure script main rejections exit with error
label Agoric-mfig-rejected-script-error
reset base-Agoric-mfig-rejected-script-error
merge -C 046eb05f8 Agoric-mfig-rejected-script-error # Merge pull request #7941 from Agoric/mfig-rejected-script-error

# Branch Agoric-mfig-specify-debian-version
label base-Agoric-mfig-specify-debian-version
pick d22f5bedf build(deployment): use `bullseye` until `bookworm` bakes a bit
pick ba2c754be fix(deployment): map Debian `bookworm` to Ubuntu `jammy`
pick 20c270206 build(deployment): pin docker to explicit `node:18`
label Agoric-mfig-specify-debian-version
reset base-Agoric-mfig-specify-debian-version
merge -C ff36f02c5 Agoric-mfig-specify-debian-version # Merge pull request #7948 from Agoric/mfig-specify-debian-version

# Branch Agoric-7369-worker-subprocess-node
label base-Agoric-7369-worker-subprocess-node
pick a72808920 Resurrect worker-subprocess-node, this time with blocking syscalls
pick 6d68c2889 feat: get basic node subprocess workers working
pick fca73a161 feat: features for node subprocess workers
pick e83286f2d fix: review feedback
pick ba7c079ae fix: improved type fussiness
pick cc9f41dec refactor: move nodeOptions into workerOptions
label Agoric-7369-worker-subprocess-node
reset base-Agoric-7369-worker-subprocess-node
merge -C 26028d4e8 Agoric-7369-worker-subprocess-node # Merge pull request #7897 from Agoric/7369-worker-subprocess-node

# Branch Agoric-dc-vstorage-js-proto
label base-Agoric-dc-vstorage-js-proto
pick 8e2042cc6 chore(cosmic-proto): rebuild to get cosmos pagination
pick 5972cb392 chore(cosmic-proto): update JS bindings to swingset protos
pick 97b167863 feat(cosmic-proto): add vstorage query
label Agoric-dc-vstorage-js-proto
reset base-Agoric-dc-vstorage-js-proto
merge -C 657b6210e Agoric-dc-vstorage-js-proto # Merge pull request #7950 from Agoric/dc-vstorage-js-proto

# Branch Agoric-raph-ut-target-steps
label base-Agoric-raph-ut-target-steps
pick 8754b0946 upgrade-test: split upgrade steps and tag
label Agoric-raph-ut-target-steps
reset base-Agoric-raph-ut-target-steps
merge -C 5736604bb Agoric-raph-ut-target-steps # Merge pull request #7835 from Agoric/raph/ut-target-steps

# Branch Agoric-7655-baggage-check
label base-Agoric-7655-baggage-check
pick eeadc462d feat: tool for auditing dangling kindID references
label Agoric-7655-baggage-check
reset base-Agoric-7655-baggage-check
merge -C 696f0a8c4 Agoric-7655-baggage-check # Merge pull request #7659 from Agoric/7655-baggage-check

# Branch Agoric-mfig-bridge-no-error-stack
label base-Agoric-mfig-bridge-no-error-stack
pick 58acca7bf test(cosmos): demonstrate Golang error frame divergence
pick 3390d902f fix(cosmos): prevent Golang error wrapping stack frame divergence
pick 49d37b3c6 test(cosmos): ensure sdkerrors do not leak stack by default
pick eaffc1b12 ci(cosmos): forbid `%w` error-wrapping format specifier
label Agoric-mfig-bridge-no-error-stack
reset base-Agoric-mfig-bridge-no-error-stack
merge -C c50674b3c Agoric-mfig-bridge-no-error-stack # Merge pull request #7930 from Agoric/mfig-bridge-no-error-stack

# Branch Agoric-mfig-ci-notifications
label base-Agoric-mfig-ci-notifications
pick 00eb1f1a5 ci(notify-status): upgrade deprecated actions
pick 25ae4f3e3 ci: send test failure notifications when not a PR
label Agoric-mfig-ci-notifications
reset base-Agoric-mfig-ci-notifications
merge -C 2c5dd59ab Agoric-mfig-ci-notifications # Merge pull request #7934 from Agoric/mfig-ci-notifications

# Branch Agoric-ta-bundle-types
label base-Agoric-ta-bundle-types
pick 848773507 chore(types): correct ManifestBundleRef
label Agoric-ta-bundle-types
reset base-Agoric-ta-bundle-types
merge -C 3a87a1254 Agoric-ta-bundle-types # Merge pull request #7957 from Agoric/ta/bundle-types

# Branch Agoric-vault-perf-measurement
label base-Agoric-vault-perf-measurement
pick 57cea7da3 feat: vault performance benchmark
label Agoric-vault-perf-measurement
reset base-Agoric-vault-perf-measurement
merge -C 4b79eb636 Agoric-vault-perf-measurement # Merge pull request #7960 from Agoric/vault-perf-measurement

# Branch Agoric-mfig-endo-ci
label base-Agoric-mfig-endo-ci
pick 78fc322e3 ci: properly handle subdependencies for Endo branch override
pick da12531db ci(SwingSet): only test golden snapshot hashes with pinned Endo
label Agoric-mfig-endo-ci
reset base-Agoric-mfig-endo-ci
merge -C b05c226c0 Agoric-mfig-endo-ci # Merge pull request #7958 from Agoric/mfig-endo-ci

# Branch Agoric-ta-refactor-clientSupport
label base-Agoric-ta-refactor-clientSupport
pick 5a6601890 refactor: OfferMaker takes agoricNames
pick 175c892b8 refactor(clientSupport): move makeParseAmount
pick d5efec3c9 refactor(clientSupport): inline parseAmount
pick b6145e335 chore!: restrict exports from 'agoric' package
pick 6c50a2201 chore(deps): remove dep on 'agoric'
pick 38919fcef ci: tighten cycles limit
pick 8968b70f2 build: gitignore graph script output
pick d08967510 build: export for loadgen
label Agoric-ta-refactor-clientSupport
reset base-Agoric-ta-refactor-clientSupport
merge -C 7632299c0 Agoric-ta-refactor-clientSupport # Merge pull request #7824 from Agoric/ta/refactor-clientSupport

# Branch Agoric-ta-ava-default-concurrency
label base-Agoric-ta-ava-default-concurrency
pick 0da672c9d ci: use Ava's default concurrency
label Agoric-ta-ava-default-concurrency
reset base-Agoric-ta-ava-default-concurrency
merge -C 6bce04955 Agoric-ta-ava-default-concurrency # Merge pull request #7974 from Agoric/ta/ava-default-concurrency

# Branch Agoric-7964-benchmark-ci-job
label base-Agoric-7964-benchmark-ci-job
pick f1713f6fd Github action to run vault perf test and publish results to datadog
label Agoric-7964-benchmark-ci-job
reset base-Agoric-7964-benchmark-ci-job
merge -C 48da7638d Agoric-7964-benchmark-ci-job # Merge pull request #7965 from Agoric/7964-benchmark-ci-job

# Branch Agoric-ta-lint-forEach
label base-Agoric-ta-lint-forEach
pick 44d47325b build: yarn add --dev eslint-plugin-github
pick 2205a7d17 ci: lint warn array-foreach
pick e1667f34a refactor: forEach -> for..of
label Agoric-ta-lint-forEach
reset base-Agoric-ta-lint-forEach
merge -C 2baa932b6 Agoric-ta-lint-forEach # Merge pull request #7983 from Agoric/ta/lint-forEach

# Branch Agoric-markm-update-error-message-test
label base-Agoric-markm-update-error-message-test
pick 37bae1315 fix(vats): update error message test
label Agoric-markm-update-error-message-test
reset base-Agoric-markm-update-error-message-test
merge -C dcddffd2f Agoric-markm-update-error-message-test # Merge pull request #7985 from Agoric/markm-update-error-message-test

# Branch Agoric-mfig-i-can-haz-builtin
label base-Agoric-mfig-i-can-haz-builtin
pick 8c0a9a408 test(xsnap): check trivial snapshot golden hashes
pick a2b48e179 build(xsnap): use `-D__has_builtin(x)=1` to avoid divergence
label Agoric-mfig-i-can-haz-builtin
reset base-Agoric-mfig-i-can-haz-builtin
merge -C a6737cdba Agoric-mfig-i-can-haz-builtin # Merge pull request #7836 from Agoric/mfig-i-can-haz-builtin

# Branch Agoric-ta-cleaner-deps
label base-Agoric-ta-cleaner-deps
pick 5adb312cf chore(governance): agoric/vats to devDependencies
pick e912fa878 refactor: move tokens.js to inter-protocol
pick bfd4f6f7b test: inline Stable token config
pick c71b0dfa1 refactor: import token config
pick 3b008535c ci: tighten cycles limit to 2
pick 4f53b3b0e refactor: marshal utils to /internal
pick 43eabdeb6 chore(types): clean up runtime imports
pick bd2565b40 chore: agoric/vats to devDependencies
pick 8fdf69fcb ci: tighten cycles limit to 1
pick 588fd2288 ci(lint): glob mjs for devDependencies
pick e8fdd967d chore: undisable no-extraneous-dependencies
pick 3aa2111ba refactor: prepare-test-env from swingset-vat
pick 464ec0345 chore: reduce extraneous dependencies
label Agoric-ta-cleaner-deps
reset base-Agoric-ta-cleaner-deps
merge -C f010e07de Agoric-ta-cleaner-deps # Merge pull request #7260 from Agoric/ta/cleaner-deps

# Branch Agoric-raph-upgrade-tests-tagging
label base-Agoric-raph-upgrade-tests-tagging
pick 7bbe44fd7 fix: use dev instead of latest
pick c4a67f268 github action uses locally built latest
pick a227d3e0c update docs
label Agoric-raph-upgrade-tests-tagging
reset base-Agoric-raph-upgrade-tests-tagging
merge -C aa8b3a119 Agoric-raph-upgrade-tests-tagging # Merge pull request #7745 from Agoric/raph/upgrade-tests-tagging

# Branch Agoric-raph-fix-dest-ci
label base-Agoric-raph-fix-dest-ci
pick 5fc741ab6 upgrade-test: do not overwrite DEST_IMAGE when set
label Agoric-raph-fix-dest-ci
reset base-Agoric-raph-fix-dest-ci
merge -C 6c6b5a02d Agoric-raph-fix-dest-ci # Merge pull request #7997 from Agoric/raph/fix-dest-ci

# Branch Agoric-otoole-brendan-patch-1
label base-Agoric-otoole-brendan-patch-1
pick b8b5c7553 Update README-bidding-cli.md
label Agoric-otoole-brendan-patch-1
reset base-Agoric-otoole-brendan-patch-1
merge -C ff1e3013a Agoric-otoole-brendan-patch-1 # Merge pull request #7998 from Agoric/otoole-brendan-patch-1

# Branch Agoric-markm-cleanups-from-8009
label base-Agoric-markm-cleanups-from-8009
pick 9d7072bde style: cleanups from #8009
label Agoric-markm-cleanups-from-8009
reset base-Agoric-markm-cleanups-from-8009
merge -C c50ca190e Agoric-markm-cleanups-from-8009 # Merge pull request #8013 from Agoric/markm-cleanups-from-8009

# Branch Agoric-mfig-fix-endo-types
label base-Agoric-mfig-fix-endo-types
pick 5b1c4cd00 refactor: adapt types for newer `@endo/eventual-send`
pick 426d613fc ci(restore-node): new `get-packed-versions.sh` cache busting
label Agoric-mfig-fix-endo-types
reset base-Agoric-mfig-fix-endo-types
merge -C e90f87b24 Agoric-mfig-fix-endo-types # Merge pull request #8007 from Agoric/mfig-fix-endo-types

# Branch Agoric-7995-bid-fees
label base-Agoric-7995-bid-fees
pick f7dd7b125 feat(inter): include raw_log in tx send error message
pick 026745342 feat(inter): --fees option for sending bid tx
pick 554bb3c9a chore(agoric-cli): update inter cli usage snapshot
pick aae3179c8 fix: suppress sign-mode diagnostic when parsing bid tx results
label Agoric-7995-bid-fees
reset base-Agoric-7995-bid-fees
merge -C f5f34f4ad Agoric-7995-bid-fees # Merge pull request #8000 from Agoric/7995-bid-fees

# Branch Agoric-typescript-5-1
label base-Agoric-typescript-5-1
pick 06ccffd2f chore: bump typescript to 5.1
pick 7a5c7e913 chore: bump @typescript-eslint/*
pick f3246e780 chore: npx yarn-deduplicate && yarn install
pick 3343c4c1b chore(types): conform to 5.1 (annotations)
pick 0b9b83c3a chore(types): conform to 5.1 (assertions)
label Agoric-typescript-5-1
reset base-Agoric-typescript-5-1
merge -C 1303537a9 Agoric-typescript-5-1 # Merge pull request #7822 from Agoric/typescript-5.1

# Branch Agoric-prettier-3-0
label base-Agoric-prettier-3-0
pick 87a2df6b0 build: yarn rebuild
pick dcb770b10 chore(deps): bump prettier to 3.0
pick cfe7c1102 style: yarn format
pick b46c46f8b style: simplify prettier config
pick a6cc2fd09 chore(deps): bump eslint-plugin-prettier (alpha)
label Agoric-prettier-3-0
reset base-Agoric-prettier-3-0
merge -C 3c22e8643 Agoric-prettier-3-0 # Merge pull request #8030 from Agoric/prettier-3.0

# Branch Agoric-ta-use-satisfies
label base-Agoric-ta-use-satisfies
pick 3c2cf6f2f chore(deps): bump eslint-plugin-jsdoc
pick 869a899b7 chore(deps): bump eslint
pick a21d30dae chore(types): use 'satisfies'
label Agoric-ta-use-satisfies
reset base-Agoric-ta-use-satisfies
merge -C 648d42f4a Agoric-ta-use-satisfies # Merge pull request #8032 from Agoric/ta/use-satisfies

# Branch Agoric-tl-lint-foreach-kernel
label base-Agoric-tl-lint-foreach-kernel
pick 3ab87441a lint: replace foreach in SwingSet with for...of
label Agoric-tl-lint-foreach-kernel
reset base-Agoric-tl-lint-foreach-kernel
merge -C b6b074d1a Agoric-tl-lint-foreach-kernel # Merge pull request #8036 from Agoric/tl-lint-foreach-kernel

# Branch Agoric-dc-cosmjs-interpose-net
label base-Agoric-dc-cosmjs-interpose-net
pick 5bc513853 feat(casting): makeHttpClient for explicit net access with cosmjs
pick 9e45ed21b chore(casting): export replayIO testing tool
pick dd56704aa chore(cosmic-proto): supply vstorage/query.js compat file
label Agoric-dc-cosmjs-interpose-net
reset base-Agoric-dc-cosmjs-interpose-net
merge -C dfc712fe1 Agoric-dc-cosmjs-interpose-net # Merge pull request #7935 from Agoric/dc-cosmjs-interpose-net

# Branch Agoric-gibson-2023-07-make-cosmos-aarch64
label base-Agoric-gibson-2023-07-make-cosmos-aarch64
pick ff2e5ed20 fix(cosmos): Support building on Linux aarch64
label Agoric-gibson-2023-07-make-cosmos-aarch64
reset base-Agoric-gibson-2023-07-make-cosmos-aarch64
merge -C 5382a55a0 Agoric-gibson-2023-07-make-cosmos-aarch64 # Merge pull request #8029 from Agoric/gibson-2023-07-make-cosmos-aarch64

# Branch Agoric-7992-enact-upgrade-plan
label base-Agoric-7992-enact-upgrade-plan
pick 6757303fc feat: Cosmos upgrade handler calls swingset
pick e088215a7 fix: test upgrade to one-past-vaults
pick e84ebf2c1 refactor: put upgrade plan in cosmos init action
pick 8d8580a8c refactor: no longer a need for upgrade function to talk over bridge
label Agoric-7992-enact-upgrade-plan
reset base-Agoric-7992-enact-upgrade-plan
merge -C bcca849b8 Agoric-7992-enact-upgrade-plan # Merge pull request #7994 from Agoric/7992-enact-upgrade-plan

# Branch Agoric-gibson-2023-07-agoric-cli
label base-Agoric-gibson-2023-07-agoric-cli
pick 712d87940 chore(agoric-cli): Rename a variable for clarity
pick c1bc6f4b4 chore(agoric-cli): DRY out "_agstate/agoric-servers" into a const
pick b5cd9fe61 chore(agoric-cli): DRY out `--reset` old directory removal
pick 11c4aaddd chore(agoric-cli): Remove unnecessary single-string interpolation
pick 53ff8a77f chore(agoric-cli): Improve `agoric start` argument handling
label Agoric-gibson-2023-07-agoric-cli
reset base-Agoric-gibson-2023-07-agoric-cli
merge -C 55ccfd2c7 Agoric-gibson-2023-07-agoric-cli # Merge pull request #8027 from Agoric/gibson-2023-07-agoric-cli

# Branch Agoric-tl-fix-lint-default-params
label base-Agoric-tl-fix-lint-default-params
pick bf94140cf chore(swingset): Fix default param lint warnings
label Agoric-tl-fix-lint-default-params
reset base-Agoric-tl-fix-lint-default-params
merge -C 6e5b422b8 Agoric-tl-fix-lint-default-params # Merge pull request #8042 from Agoric/tl-fix-lint-default-params

# Branch Agoric-ta-export-ts
label base-Agoric-ta-export-ts
pick c158ff119 build: DRY out tsconfig build options
pick 430568ba0 build: export inter-protocol types
label Agoric-ta-export-ts
reset base-Agoric-ta-export-ts
merge -C e96a12afc Agoric-ta-export-ts # Merge pull request #8046 from Agoric/ta/export-ts

# Branch Agoric-gibson-2023-07-agoric-cli-cleanup
label base-Agoric-gibson-2023-07-agoric-cli-cleanup
pick 7ce5410bc refactor(agoric-cli): Improve git clone efficiency
label Agoric-gibson-2023-07-agoric-cli-cleanup
reset base-Agoric-gibson-2023-07-agoric-cli-cleanup
merge -C bd1190d9e Agoric-gibson-2023-07-agoric-cli-cleanup # Merge pull request #8057 from Agoric/gibson-2023-07-agoric-cli-cleanup

# Branch Agoric-4620-ts-project
label base-Agoric-4620-ts-project
pick 0fbb885f3 chore(deps): bump typescript-eslint to 6.1
pick 3b351c289 ci: skip safe-await for cli
pick b8e19f5ef ci: always lint with types
pick 12124cd7c ci: tsconfig for eslint-ed files
pick afe41ba3f ci: include 'test' dirs in ts glob
pick 272d30cc9 chore(deps); explicit types for yargs-parser
pick 79417de6f chore(deps): upgrade acorn
pick 453922a01 chore: run lint-fix for default-params rule
pick fd187e08d chore(types): lint 'scripts'
pick 903fef713 ci: disable lint for Golang
label Agoric-4620-ts-project
reset base-Agoric-4620-ts-project
merge -C 6f740a407 Agoric-4620-ts-project # Merge pull request #8058 from Agoric/4620-ts-project

# Branch Agoric-8012-refactor-liveslots-vatstore-usage
label base-Agoric-8012-refactor-liveslots-vatstore-usage
pick 886e2fac1 fix: refactor vatstore usage to fix test failures
pick 1fdae6f42 chore: make eslint shut up in the face of newfangled linting rules
pick 5641fb0ef fix: incorporate refactored VRM into fakeVirtualSupport
label Agoric-8012-refactor-liveslots-vatstore-usage
reset base-Agoric-8012-refactor-liveslots-vatstore-usage
merge -C 35576e9f8 Agoric-8012-refactor-liveslots-vatstore-usage # Merge pull request #8066 from Agoric/8012-refactor-liveslots-vatstore-usage

# Branch Agoric-gibson-2023-07-upgrade-considerations
label base-Agoric-gibson-2023-07-upgrade-considerations
pick cc6560e23 chore: Add "Upgrade Considerations" to GitHub templates
label Agoric-gibson-2023-07-upgrade-considerations
reset base-Agoric-gibson-2023-07-upgrade-considerations
merge -C af622794b Agoric-gibson-2023-07-upgrade-considerations # Merge pull request #8064 from Agoric/gibson-2023-07-upgrade-considerations

# Branch Agoric-mfig-debug-deploy
label base-Agoric-mfig-debug-deploy
pick 52db65e1e ci(deployment-test): remove hardwired /usr/src/agoric-sdk
pick 4d14a2f6c fix(solo): let `init` tolerate existing `html` directory
pick af4784216 feat(deployment): only include this package in `setup` docker image
pick 3d4dd2bc0 feat(deployment): `docker/integration-test.sh` for nested execution
pick 7d435cb42 fix(deployment-integration): reenable DOCKER_VOLUMES
pick 8161c5e24 feat(deployment): find testnet-load-generator in parent of agoric-sdk
pick 2fa06dcc7 fix(scripts): remove new home folder before local deployment test
label Agoric-mfig-debug-deploy
reset base-Agoric-mfig-debug-deploy
merge -C afe8a6e78 Agoric-mfig-debug-deploy # Merge pull request #8004 from Agoric/mfig-debug-deploy

# Branch Agoric-mhofman-refactor-cosmos-init
label base-Agoric-mhofman-refactor-cosmos-init
pick 5412966ae refactor(cosmic-swingset): portNums are static in init
pick b8a817dfa fix(x/vstorage): value can be empty in genesis data
pick deaa061e6 chore(x/vstorage): remove nodata migration logic
pick e7f5b658b fix(cosmos): module order independent init and bootstrap
pick b4dbbf782 chore(cosmic-swingset): check state before snapshot restore
pick 35f03f9f2 fix(x/swingset): enforce snapshot restore before init
pick 554a1102a fix(x/swingset): guard snapshot restore for concurrency
label Agoric-mhofman-refactor-cosmos-init
reset base-Agoric-mhofman-refactor-cosmos-init
merge -C 22cbeb145 Agoric-mhofman-refactor-cosmos-init # Merge pull request #8060 from Agoric/mhofman/refactor-cosmos-init

# Branch Agoric-kris-sync-endo-2023-07-20-20-11-31
label base-Agoric-kris-sync-endo-2023-07-20-20-11-31
pick 5a92a7fb8 chore: Sync Endo versions
pick 220f48c85 chore: Update yarn.lock
pick 47754cf2a chore: Ramp meter version
pick 2e3caa0e7 chore(swingset-vat): Update xsnap store test snapshots
pick 593f7f08b chore: Manually normalize yarn.lock
pick a131a4154 chore(deps): yarn-deduplicate
label Agoric-kris-sync-endo-2023-07-20-20-11-31
reset base-Agoric-kris-sync-endo-2023-07-20-20-11-31
merge -C 857e6508f Agoric-kris-sync-endo-2023-07-20-20-11-31 # Merge pull request #8074 from Agoric/kris-sync-endo-2023-07-20-20-11-31

# Branch Agoric-4900-autoformat-jsdoc-run-protocol
label base-Agoric-4900-autoformat-jsdoc-run-protocol
pick 0843f37a1 chore(deps): bump eslint-plugin-prettier to v5 release
pick a366a6d72 chore: adopt prettier-plugin-jsdoc for inter-protocol package
pick 9f3fadee9 style: format with jsdoc plugin
pick 961c7f85b style: indent code blocks
pick 48fe17934 chore: adopt prettier-plugin-jsdoc (vats)
pick 73093ebe1 chore: adopt prettier-plugin-jsdoc (ERTP)
pick f1224892d style: manual tweaks
label Agoric-4900-autoformat-jsdoc-run-protocol
reset base-Agoric-4900-autoformat-jsdoc-run-protocol
merge -C 284e2db51 Agoric-4900-autoformat-jsdoc-run-protocol # Merge pull request #4906 from Agoric/4900-autoformat-jsdoc-run-protocol

# Branch Agoric-mfig-endo-resm-compat
label base-Agoric-mfig-endo-resm-compat
pick c507ba10c test(agoric-cli): reenable resm-plugin test with some Endo patches
label Agoric-mfig-endo-resm-compat
reset base-Agoric-mfig-endo-resm-compat
merge -C fb922d3ae Agoric-mfig-endo-resm-compat # Merge pull request #8076 from Agoric/mfig-endo-resm-compat

# Branch Agoric-mhofman-fix-deployment-ci-loadgen
label base-Agoric-mhofman-fix-deployment-ci-loadgen
pick 9b9b35ef1 fix(ci): checkout agoric-sdk in sub folder Restore loadgen in deployment test
pick a59f16200 fix(ci): require loadgen in deployment integration test
pick ea7e883f4 fix(deployment): propagate `ag-setup-cosmos` path to faucet script remove remnants of `ag-setup-cosmos` symlink
pick 680c01aac ci(deployment-test): separate network and SDK dirs
label Agoric-mhofman-fix-deployment-ci-loadgen
reset base-Agoric-mhofman-fix-deployment-ci-loadgen
merge -C 8bcf6af10 Agoric-mhofman-fix-deployment-ci-loadgen # Merge pull request #8085 from Agoric/mhofman/fix-deployment-ci-loadgen

# Branch Agoric-ta-lerna-v5
label base-Agoric-ta-lerna-v5
pick 1c217cf7b chore(deps): bump lerna to 5.6.2
pick ccc21766b chore(deps): npx yarn-deduplicate
pick b0aefc4e0 chore: update patches for hoisted packages
pick 842e598a9 chore(deps): yarn add -D @types/glob
pick 48eefb16d chore(deps): bump morgan to 1.10 (cleanup depd)
pick 9ce485813 chore(deps): rm obsolete resolutions
label Agoric-ta-lerna-v5
reset base-Agoric-ta-lerna-v5
merge -C 9c40cec40 Agoric-ta-lerna-v5 # Merge pull request #5927 from Agoric/ta/lerna-v5

# Branch Agoric-8079-fix-vaults-upgradability
label base-Agoric-8079-fix-vaults-upgradability
pick bd46e784a Revert "feat(inter-protocol)!: rename InterestRate to StabilityFee"
pick f0a9fcf3d Revert "feat(inter-protocol)!: rename interestSnapshot, latestInterestUpdate, and compoundedInterest"
pick c3a691231 Revert "feat(inter-protocol)!: rename debtSnapshot.interest to stabilityFee"
label Agoric-8079-fix-vaults-upgradability
reset base-Agoric-8079-fix-vaults-upgradability
merge -C ced08aa10 Agoric-8079-fix-vaults-upgradability # Merge pull request #8084 from Agoric/8079-fix-vaults-upgradability

# Branch Agoric-8041-resetLockedQuote
label base-Agoric-8041-resetLockedQuote
pick d8ab5a552 fix: reset lockedQuote even when nothing will be auctioned
pick 57a5b1d74 chore: consistently don't await writeMetrics().
pick c5b4e334c chore: add a comma required by lint
label Agoric-8041-resetLockedQuote
reset base-Agoric-8041-resetLockedQuote
merge -C 5bd1690ce Agoric-8041-resetLockedQuote # Merge pull request #8070 from Agoric/8041-resetLockedQuote

# Branch Agoric-8091-workaround
label base-Agoric-8091-workaround
pick 014a2ed8f ci: lerna publish sequentially
label Agoric-8091-workaround
reset base-Agoric-8091-workaround
merge -C 8358d208a Agoric-8091-workaround # Merge pull request #8092 from Agoric/8091-workaround

# Branch Agoric-mfig-zone-make-once
label base-Agoric-mfig-zone-make-once
pick d3be4c084 feat(zone): implement `zone.makeOnce(key, maker)`
pick 7a1a411cf feat(zone)!: use fresh heap and virtual zones
pick 5e3f6a66d fix(zone): add `wrapProvider` and manage `backingStore`
pick ac9268664 fix(zone): track baggage keys as used by `@agoric/vat-data`
pick 20feefbde feat(zone): implement `isStorable` for virtual zones
pick e9e0e2196 fix(zone): suggestions for #7891
pick 9bbb393ac fix(zone): fixups before merging to 7891
pick d68bc8464 fix(zone): no longer getting M from @agoric/zone
pick ea283670a fix: review suggestions
pick 2ca7943f9 fix(zone): review suggestion
pick 989becb26 test(zone): add more tests
pick fe72e6b68 test(setup-vat-data): move to SwingSet/tools
pick 670f0d71b test(swingset-liveslots): properly `registerEntry` in `fakeVirtualSupport.js`
pick dc8eb4a71 test(swingset-liveslots): better capture `WeakMap` and `WeakSet`
label Agoric-mfig-zone-make-once
reset base-Agoric-mfig-zone-make-once
merge -C 8baf0aabe Agoric-mfig-zone-make-once # Merge pull request #7891 from Agoric/mfig-zone-make-once

# Branch Agoric-ta-contract-start
label base-Agoric-ta-contract-start
pick af72d6844 refactor: "meta" grouping of arg validation
pick 0bf769313 BREAKING CHANGE: remove 'prepare'
pick 5ae46e485 feat: start fn upgradability by meta
label Agoric-ta-contract-start
reset base-Agoric-ta-contract-start
merge -C ad3aa42e8 Agoric-ta-contract-start # Merge pull request #8045 from Agoric/ta/contract-start

# Branch Agoric-mfig-null-resolutions
label base-Agoric-mfig-null-resolutions
pick 7629daca3 fix(resolve-versions): tolerate missing `package.json` resolutions
label Agoric-mfig-null-resolutions
reset base-Agoric-mfig-null-resolutions
merge -C 5eb596e63 Agoric-mfig-null-resolutions # Merge pull request #8099 from Agoric/mfig-null-resolutions

# Branch Agoric-6678-intrinsicAtomicTransfer
label base-Agoric-6678-intrinsicAtomicTransfer
pick 63ee139f2 refactor: move atomicRearrange into Zcf
pick ff54e4129 test:  exclude test-atomicRearrange from XS testing
pick 03ac2cd56 chore: remove unhelpful type and default declaration
pick f54a73b7d chore: simplify remain atomicRearrange helper; use forEach over map
pick b9c3ff2fe chore: local review clean-ups
pick 8de850073 doc: add void label on remote call to replaceAllocatios() & document
label Agoric-6678-intrinsicAtomicTransfer
reset base-Agoric-6678-intrinsicAtomicTransfer
merge -C cc5432550 Agoric-6678-intrinsicAtomicTransfer # Merge pull request #7900 from Agoric/6678-intrinsicAtomicTransfer

# Branch Agoric-6678-upgradeZoeZcf
label base-Agoric-6678-upgradeZoeZcf
pick 9ac09b129 fix: make zoeStorageModule correctly restart with zcfMints present.
pick 7e2c8d77b chore: use a fresh zcfBundleCap from inside startInstance
pick c4f6e85b1 feat(zoe!):add a config facet to Zoe so the zcfBundle can be updated
pick 948709500 chore: add a comment explaining why only zoeConfigFacet is used
pick 3b65d0391 chore: upgrade warning on inabilty to upgrade to error, and throw
label Agoric-6678-upgradeZoeZcf
reset base-Agoric-6678-upgradeZoeZcf
merge -C e6e23eba1 Agoric-6678-upgradeZoeZcf # Merge pull request #7946 from Agoric/6678-upgradeZoeZcf

# Branch Agoric-6678-test-upgradeZoeZcf
label base-Agoric-6678-test-upgradeZoeZcf
pick b47277385 test: a test framework for verifying upgrade of Zoe and ZCF
pick 58135358f chore: improved comments and formatting and moving functions
pick 5b37aab5c chore: lint whitespace and types
pick 4c5ea0e5b chore: revert to start; handle missing storageNode; install probe
label Agoric-6678-test-upgradeZoeZcf
reset base-Agoric-6678-test-upgradeZoeZcf
merge -C 3a7ade3a5 Agoric-6678-test-upgradeZoeZcf # Merge pull request #7966 from Agoric/6678-test-upgradeZoeZcf

# Branch Agoric-4645-reduce-cycles
label base-Agoric-4645-reduce-cycles
pick deb1b8451 chore(deps): drop @agoric/store dep
pick b53bcbab9 refactor: move netstring to internal
pick 7d824b7a4 refactor: move lib-nodejs to internal
pick 4020e14fd build: remove swingset-vat dep
pick c86d6dd4d build: remove deploy-script-support dep
pick d46f7e32e build(deps): eliminate agoric/store dep
label Agoric-4645-reduce-cycles
reset base-Agoric-4645-reduce-cycles
merge -C c4a07a45a Agoric-4645-reduce-cycles # Merge pull request #8094 from Agoric/4645-reduce-cycles

# Branch Agoric-6678-upgradeZoeZcf-docker
label base-Agoric-6678-upgradeZoeZcf-docker
pick 126173200 test: a docker test for the zoe/zcf upgrade
label Agoric-6678-upgradeZoeZcf-docker
reset base-Agoric-6678-upgradeZoeZcf-docker
merge -C 29ef60f58 Agoric-6678-upgradeZoeZcf-docker # Merge pull request #8018 from Agoric/6678-upgradeZoeZcf-docker

# Branch Agoric-gibson-7581-rpc-capdata-formatting
label base-Agoric-gibson-7581-rpc-capdata-formatting
pick 8bdd7cb91 feat(cosmos): Add a vstorage package for decoding CapData
pick 8943f2f85 feat(cosmos): Add a "CapData" vstorage RPC endpoint
pick b68a5baa7 chore(cosmos): Regenerate protobuf code
pick 22c7d49e4 fixup! feat(cosmos): Add a "CapData" vstorage RPC endpoint
pick 935650975 chore(cosmos): Improve vstorage capdata error messages
pick 36b921d58 test(cosmos): Test vstorage capdata
pick a7f17febb test(cosmos): Test gRPC endpoint "/agoric.vstorage.Query/CapData"
pick e4bfad38b chore(cosmos): Improve vstorage/keeper/grpc_query.go doc comments
pick dff7e9329 chore(cosmos): Add vstorage README
pick b4fdcc900 chore(cosmos): Avoid special treatment of HTML characters in vstorage JSON encoding
pick e2cbffacc feat(cosmos): Always include alleged name and slot id in vstorage CapData remotable representations
label Agoric-gibson-7581-rpc-capdata-formatting
reset base-Agoric-gibson-7581-rpc-capdata-formatting
merge -C 91f5e93d5 Agoric-gibson-7581-rpc-capdata-formatting # Merge pull request #8056 from Agoric/gibson-7581-rpc-capdata-formatting

# Branch Agoric-mhofman-fix-controller-init-upgrade
label base-Agoric-mhofman-fix-controller-init-upgrade
pick b4260afd1 fix(cosmos): don't init controller before upgrade
pick e7cd76222 refactor(cosmic-swingset): consolidate init and bootstrap
pick 655133ed9 feat(cosmic-swingset): add JS upgrade plan handler stub
pick 2e06f2558 refactor(cosmic-swingset): factor out common blockingSend steps
label Agoric-mhofman-fix-controller-init-upgrade
reset base-Agoric-mhofman-fix-controller-init-upgrade
merge -C f84ea2e16 Agoric-mhofman-fix-controller-init-upgrade # Merge pull request #8106 from Agoric/mhofman/fix-controller-init-upgrade

# Branch Agoric-mhofman-fix-upgrade-test
label base-Agoric-mhofman-fix-upgrade-test
pick 371f65ab6 fix(deployment): localize script to upgrade
label Agoric-mhofman-fix-upgrade-test
reset base-Agoric-mhofman-fix-upgrade-test
merge -C e28392f88 Agoric-mhofman-fix-upgrade-test # Merge pull request #8111 from Agoric/mhofman/fix-upgrade-test

# Branch Agoric-mfig-disable-zoe-full-upgrade
label base-Agoric-mfig-disable-zoe-full-upgrade
pick 437a64c96 ci(upgrade-test): bypass zoe-full-upgrade with hardcoded bundleIDs
pick 8d742f418 ci(test-docker-build): try making more free disk space
label Agoric-mfig-disable-zoe-full-upgrade
reset base-Agoric-mfig-disable-zoe-full-upgrade
merge -C 8000afb67 Agoric-mfig-disable-zoe-full-upgrade # Merge pull request #8116 from Agoric/mfig-disable-zoe-full-upgrade

# Branch Agoric-gibson-8056-followup
label base-Agoric-gibson-8056-followup
pick f1cb453ae chore(cosmos): Update doc comments for accuracy
pick 749a73719 docs(cosmos): Fix hyperlinks
label Agoric-gibson-8056-followup
reset base-Agoric-gibson-8056-followup
merge -C d55dda861 Agoric-gibson-8056-followup # Merge pull request #8119 from Agoric/gibson-8056-followup

# Branch Agoric-mhofman-8081-replicate-state-sync-issue
label base-Agoric-mhofman-8081-replicate-state-sync-issue
pick b9d4b6512 refactor(deployment): upgrade test provide agd commands
pick b06beec9e feat(deployment): replicate broken state sync in upgrade test
label Agoric-mhofman-8081-replicate-state-sync-issue
reset base-Agoric-mhofman-8081-replicate-state-sync-issue
merge -C 52c75d4b5 Agoric-mhofman-8081-replicate-state-sync-issue # Merge pull request #8107 from Agoric/mhofman/8081-replicate-state-sync-issue

# Branch Agoric-gibson-8056-followup-2
label base-Agoric-gibson-8056-followup-2
pick 68f158677 docs(cosmos/x/vstorage): Add REAME link to vstorage/query.proto
label Agoric-gibson-8056-followup-2
reset base-Agoric-gibson-8056-followup-2
merge -C 4264b77fd Agoric-gibson-8056-followup-2 # Merge pull request #8130 from Agoric/gibson-8056-followup-2

# Branch Agoric-dc-wallet-remote-types
label base-Agoric-dc-wallet-remote-types
pick 999c92021 chore(smart-wallet): don't try to distinguish presences statically
label Agoric-dc-wallet-remote-types
reset base-Agoric-dc-wallet-remote-types
merge -C 50332a848 Agoric-dc-wallet-remote-types # Merge pull request #8120 from Agoric/dc-wallet-remote-types

# Branch Agoric-8122-rm-sharing-service
label base-Agoric-8122-rm-sharing-service
pick 71c9b4d3e chore: remove sharing-service demo
label Agoric-8122-rm-sharing-service
reset base-Agoric-8122-rm-sharing-service
merge -C 68f7b6bcb Agoric-8122-rm-sharing-service # Merge pull request #8124 from Agoric/8122-rm-sharing-service

# Branch Agoric-markm-tolerate-golden-error-prop-order
label base-Agoric-markm-tolerate-golden-error-prop-order
pick 7a32cad94 fix: tolerate golden error property reorders
label Agoric-markm-tolerate-golden-error-prop-order
reset base-Agoric-markm-tolerate-golden-error-prop-order
merge -C f20cc0580 Agoric-markm-tolerate-golden-error-prop-order # Merge pull request #8126 from Agoric/markm-tolerate-golden-error-prop-order

# Branch Agoric-7279-boot-package
label base-Agoric-7279-boot-package
pick 8e3173b0b feat: new 'boot' package with bootstrap configs
pick 13e40bac4 test: move upgrade/bootstrapTests to agoric/boot
pick 9626a5d9b chore: cleanup dependencies
pick d45ed35de chore: cleanup scripts
pick 97a9db5fa BREAKING CHANGE: move authorityViz to boot package
pick 8d3f8477e refactor: move tokens.js to internal
pick d1ca4ddaf refactor: export bootstrap-relay in tools
pick 4da1a0437 test: use package paths in sourceSpec
pick 643a102b4 chore: restore vats bootstrap configs for upgrade tests
label Agoric-7279-boot-package
reset base-Agoric-7279-boot-package
merge -C 1c39a8b81 Agoric-7279-boot-package # Merge pull request #8102 from Agoric/7279-boot-package

# Branch Agoric-gibson-8056-followup-3
label base-Agoric-gibson-8056-followup-3
pick 8f7e4b4d2 docs(cosmos/x/vstorage): Add README section for "REST" API interface
pick 7a70695b6 docs(cosmos/x/vstorage): Add README section for CLI
label Agoric-gibson-8056-followup-3
reset base-Agoric-gibson-8056-followup-3
merge -C b4ce02d92 Agoric-gibson-8056-followup-3 # Merge pull request #8134 from Agoric/gibson-8056-followup-3

# Branch Agoric-mfig-vatconfig-on-init
label base-Agoric-mfig-vatconfig-on-init
pick 2f8fa9172 chore: remove vaults bootstrap configs
pick d0da13cce chore(test-docker-build): break up overlong line
pick cfb72f337 fix(cosmic-swingset): only require vatconfig if uninitialized
pick e9d24cdfa fix(boot): import ambient types from Zoe
label Agoric-mfig-vatconfig-on-init
reset base-Agoric-mfig-vatconfig-on-init
merge -C 9f8a76ee6 Agoric-mfig-vatconfig-on-init # Merge pull request #8140 from Agoric/mfig-vatconfig-on-init

# Branch Agoric-8088-vat-data-cycles
label base-Agoric-8088-vat-data-cycles
pick 8e02f2863 test: more complete 'absent' test
pick d1e7e3473 test: simpler presence test
pick f2315290b refactor(types): move vatData to liveslots
pick e66dd52c5 refactor: move install-ses-debug to internal
pick 8050e2aee refactor: move setup-vat-data to liveslots
pick 3e210fa85 refactor: move prepare-test-env to liveslots
pick 1cee736ce test: use liveslots test env
pick 3103f0a46 refactor(types): package export for vatDataTypes
label Agoric-8088-vat-data-cycles
reset base-Agoric-8088-vat-data-cycles
merge -C e68f2805d Agoric-8088-vat-data-cycles # Merge pull request #8139 from Agoric/8088-vat-data-cycles

# Branch Agoric-7226-sw-nft-issuer
label base-Agoric-7226-sw-nft-issuer
pick eda89cc7e feat(internal): fakeStorage.getBody() supports index other than -1
pick 783193fad chore: more FarRef<Payment> lint
pick 33f2859d7 feat(smart-wallet): withdraw payments before getting invitation
pick 4c2bec7dc feat(smart-wallet): trading in non-vbank asset
pick 3393c4745 test(inter-protocol): update "no purse" test
pick c2a8b9835 style: convert forEach
label Agoric-7226-sw-nft-issuer
reset base-Agoric-7226-sw-nft-issuer
merge -C 5513deae3 Agoric-7226-sw-nft-issuer # Merge pull request #8071 from Agoric/7226-sw-nft-issuer

# Branch Agoric-mhofman-refactor-snapshotter
label base-Agoric-mhofman-refactor-snapshotter
pick bc6d9b6b6 refactor(cosmos): rename snapshot artifact protobuf
pick 866637cc5 refactor(x/swingset): consistent height handling in snapshotter
pick a3def03f2 chore(x/swingset): remove disabled restore using untrusted data
pick 2cd3d08fe chore(x/swingset): better handle snapshot retrieve errors
pick f632d2b2d chore: add sequence diagrams of state-sync process
pick 23aad6cbd refactor(x/swingset): better export js-golang interface types
pick 17b7558ef chore(x/swingset): update some godoc
pick 05bbee539 feat(x/swingset): add WaitUntilSwingStoreExportDone
pick 62eb71de7 refactor(x/swingset): split snapshotter
label base-Merge-split-of-snapshotter-go
# Merge-split-of-snapshotter-go
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
pick b7bb06c35 chore(x/swingset): rename to extension_snapshotter.go
pick d42c2cac9 chore(x/swingset): remove SwingStoreExportsHandler from extension_snapshotter.go
label Merge-split-of-snapshotter-go
# Merge-split-of-snapshotter-go-2
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
pick a73868b01 chore(x/swingset): rename to swing_store_exports_handler.go
pick 757557c49 chore(x/swingset): remove ExtensionSnapshotter from swing_store_exports_handler.go
label Merge-split-of-snapshotter-go-2
# Continuation of Agoric-mhofman-refactor-snapshotter
reset base-Merge-split-of-snapshotter-go # refactor(x/swingset): split snapshotter
merge -C be6bab230 Merge-split-of-snapshotter-go Merge-split-of-snapshotter-go-2 # Merge split of snapshotter.go
pick a1290eff7 feat(x/swingset): allow taking snapshot latest height
pick ead6730a3 chore(cosmic-swingset): thread snapshot options through
label Agoric-mhofman-refactor-snapshotter
reset base-Agoric-mhofman-refactor-snapshotter
merge -C 3679b4c27 Agoric-mhofman-refactor-snapshotter # Merge pull request #8072 from Agoric/mhofman/refactor-snapshotter

# Branch Agoric-ta-package-docs
label base-Agoric-ta-package-docs
pick a3aaa9e80 docs: update instructions for adding package
pick 917211fe1 docs: move package docs to packages path
label Agoric-ta-package-docs
reset base-Agoric-ta-package-docs
merge -C 6f05870ee Agoric-ta-package-docs # Merge pull request #8142 from Agoric/ta/package-docs

# Branch Agoric-7175-expungeTests
label base-Agoric-7175-expungeTests
pick 76f03015f test: drop obsolete tests
label Agoric-7175-expungeTests
reset base-Agoric-7175-expungeTests
merge -C ff34bdfa0 Agoric-7175-expungeTests # Merge pull request #8149 from Agoric/7175-expungeTests

# Branch Agoric-mfig-vibc-write-open-init
label base-Agoric-mfig-vibc-write-open-init
pick 10bcb5cf6 fix(vibc): accommodate ibc-go v3 breaking changes
pick 61e97352c docs(SwingSet): remove mention of obsolete "need prompt ACK" for IBC network
pick 76bdc3f4a fix(vibc): put extraneous `CounterpartyChannelID` in `Counterparty` struct
label Agoric-mfig-vibc-write-open-init
reset base-Agoric-mfig-vibc-write-open-init
merge -C 81776f397 Agoric-mfig-vibc-write-open-init # Merge pull request #8127 from Agoric/mfig-vibc-write-open-init

# Branch Agoric-mfig-base-zone
label base-Agoric-mfig-base-zone
pick e275f405b chore(zone): move guts to `@agoric/base-zone`
pick b7bc67723 feat(base-zone): new package
pick 2a2f6841f refactor: use internals from `@agoric/base-zone`
pick dc7045430 chore(agoric-cli): rebuild `sdk-package-names.js`
pick 4fc4b6634 ci(test-all-packages): add `@agoric/base-zone`
pick e3979d9a2 chore(store): break dependency on `@agoric/internal`
pick 70bdfa4e0 fix(zone): update typing infrastructure
pick faa2cbb72 chore(internal): break `@agoric/zone` cycle
pick 90250d370 build(base-zone): add prepack/postpack
pick 591e9226b build(zone): add prepack/postpack
pick d13e6d2fa docs(internal): update README with dependency policy
pick 75808055a fix: update TS types
label Agoric-mfig-base-zone
reset base-Agoric-mfig-base-zone
merge -C c4e469386 Agoric-mfig-base-zone # Merge pull request #8144 from Agoric/mfig-base-zone

# Branch Agoric-fix-local-npm-test
label base-Agoric-fix-local-npm-test
pick c3b3b5fbc ci: timeout agoric-cli integration-test
pick d33798747 test: use importMetaResolve
pick 8b1ecad8a feat: vm-config package
pick 440e62ee4 test: move vats benchmark to 'boot'
pick 97d4ec5b7 build: don't publish agoric/boot
pick 64a1b6619 ci: fix lint
pick b22eef162 style: for loop
label Agoric-fix-local-npm-test
reset base-Agoric-fix-local-npm-test
merge -C a2db14283 Agoric-fix-local-npm-test # Merge pull request #8141 from Agoric/fix-local-npm-test

# Branch Agoric-mfig-vats-network
label base-Agoric-mfig-vats-network
pick 1ebfef70f chore(network): extract network implementation from SwingSet
pick c7ae7d735 chore: enact new `@agoric/network` location
pick 7e42398b1 chore(vats): fix the lint
pick 6b063a897 ci(graph): reserve stdout for parsable output
label Agoric-mfig-vats-network
reset base-Agoric-mfig-vats-network
merge -C 2f092c3a2 Agoric-mfig-vats-network # Merge pull request #8151 from Agoric/mfig-vats-network

# Branch Agoric-8025-swingstore-missing-metadata
label base-Agoric-8025-swingstore-missing-metadata
pick 08b71f90d refactor(swing-store): refactor swingstore into better pieces
pick 38c9efce1 fix: rewrite importSwingStore to preserve metadata properly
pick 33b5c1c1f feat(swingstore): add repairMetadata()
label Agoric-8025-swingstore-missing-metadata
reset base-Agoric-8025-swingstore-missing-metadata
merge -C 9d4eaadaa Agoric-8025-swingstore-missing-metadata # Merge pull request #8075 from Agoric/8025-swingstore-missing-metadata

# Branch Agoric-raphdev-patch-1
label base-Agoric-raphdev-patch-1
pick 39558c04b fix(upgrade-test): use correct mainnet-1b image
label Agoric-raphdev-patch-1
reset base-Agoric-raphdev-patch-1
merge -C aa10ecdb7 Agoric-raphdev-patch-1 # Merge pull request #8165 from Agoric/raphdev-patch-1

# Branch Agoric-mfig-improve-docker-test
label base-Agoric-mfig-improve-docker-test
pick 5f703d72c feat(upgrade-test): plumb and use `UPGRADE_INFO`
pick 735246a6b fix(upgrade-test): abort if proposal is rejected
pick 524905d6c test(upgrade-test): default init-network core proposal for agoric-upgrade-11
pick 1b23d3112 fix(upgrade-test): use `agoric-upgrade-10` tag 35
pick 844556ba1 fix(upgrade-test): use default `$DEBUG` for docker run
label Agoric-mfig-improve-docker-test
reset base-Agoric-mfig-improve-docker-test
merge -C 2d71c017b Agoric-mfig-improve-docker-test # Merge pull request #8166 from Agoric/mfig-improve-docker-test

# Branch Agoric-mfig-endo-branch-cache
label base-Agoric-mfig-endo-branch-cache
pick 84101f15e ci(restore-node): avoid clobbering `#endo-branch:` setup
label Agoric-mfig-endo-branch-cache
reset base-Agoric-mfig-endo-branch-cache
merge -C d97cea7f5 Agoric-mfig-endo-branch-cache # Merge pull request #8155 from Agoric/mfig-endo-branch-cache

# Branch Agoric-8045-backwards-compatibility
label base-Agoric-8045-backwards-compatibility
pick 1c6031bbf style: for loop
pick 035f122da test: extract zoe-startInstance test file
pick 5e2a766c7 test: backwards compatibility with 'prepare'
pick 876cf12df fix: backwards compatibility with 'prepare'
label Agoric-8045-backwards-compatibility
reset base-Agoric-8045-backwards-compatibility
merge -C cbec0c67e Agoric-8045-backwards-compatibility # Merge pull request #8146 from Agoric/8045-backwards-compatibility

# Branch Agoric-kris-8034-bundle-pattern
label base-Agoric-kris-8034-bundle-pattern
pick 93d55b52c refactor(swingset-vat): Match bundles with pattern
pick 843155a59 fix: expand length limit for bundles
pick 9e3b53918 fix: apply limit to correct property
label Agoric-kris-8034-bundle-pattern
reset base-Agoric-kris-8034-bundle-pattern
merge -C b0b230ad6 Agoric-kris-8034-bundle-pattern # Merge pull request #8038 from Agoric/kris-8034-bundle-pattern

# Branch Agoric-mfig-staged-endo
label base-Agoric-mfig-staged-endo
pick 393201713 ci(restore-node): detect staged `yarn.lock`, `package.json`
pick 70cb214ec ci(test-dapp): find `notify-status` action in `./agoric-sdk`
label Agoric-mfig-staged-endo
reset base-Agoric-mfig-staged-endo
merge -C 3573f7960 Agoric-mfig-staged-endo # Merge pull request #8168 from Agoric/mfig-staged-endo

# Branch Agoric-mhofman-8031-more-snapshot-logic-refactor
label base-Agoric-mhofman-8031-more-snapshot-logic-refactor
pick 7d3eafaf9 refactor(x/swingset): ReadArtifact -> ReadNextArtifact
pick d92bfb5d9 refactor(x/swingset): create restore context in app
pick e0c018616 refactor(cosmos): shared KVEntry
pick 1bba8592e feat(cosmos): KVEntry implements json Marshaler and Unmarshaller
pick 027e8a2c9 refactor(cosmos): add KVEntry helpers
pick 6c3d70993 refactor(x/swingset): switch to KVEntryReader for export data
label Agoric-mhofman-8031-more-snapshot-logic-refactor
reset base-Agoric-mhofman-8031-more-snapshot-logic-refactor
merge -C d6bb5643d Agoric-mhofman-8031-more-snapshot-logic-refactor # Merge pull request #8175 from Agoric/mhofman/8031-more-snapshot-logic-refactor

# Branch Agoric-mhofman-8031-swing-store-sync-refactor
label base-Agoric-mhofman-8031-swing-store-sync-refactor
pick ea582bf77 feat(cosmos): wire new swingset port handler
pick 1534adde5 feat(cosmic-swingset): use x/swingset for swing-store export data
pick 9df85cf49 feat(x/swingset): add store data to genesis
label Agoric-mhofman-8031-swing-store-sync-refactor
reset base-Agoric-mhofman-8031-swing-store-sync-refactor
merge -C fed2b5e46 Agoric-mhofman-8031-swing-store-sync-refactor # Merge pull request #8043 from Agoric/mhofman/8031-swing-store-sync-refactor

# Branch Agoric-ta-builders-package
label base-Agoric-ta-builders-package
pick 5e2b328d1 fix: await price feed offers
pick 42c1c6ffa style: for loop
pick 835cc27bd feat: better diagnostic for bad proposal
pick 009986b1b build: make boot package private
pick 00c88ab16 feat: new 'builders' package
pick 59b2b0d25 test: move inter proposal tests
pick 4df6e7584 refactor: inter-protocol scripts to 'builders' package
pick 3a319f219 refactor: vats scripts to 'builders' package
pick 61a8ab0b8 refactor: pegasus scripts to 'builders' package
pick 6a3423159 build: rm obsolete build-bundles
pick fddeac889 chore(types): resolution hacks
pick 18e971964 chore: remove measure-metering tool
label Agoric-ta-builders-package
reset base-Agoric-ta-builders-package
merge -C d1a4a539c Agoric-ta-builders-package # Merge pull request #8150 from Agoric/ta/builders-package

# Branch Agoric-mfig-swup-core-proposals
label base-Agoric-mfig-swup-core-proposals
pick 4ca9a0b5c feat(deploy-script-support): generalize `extractCoreProposalBundles`
pick 3825c171f feat(cosmic-swingset): implement `ENACTED_UPGRADE` blocking send
pick 49cb43fee docs(test-docker-build): add some useful comments
pick b14ca404e fix(cosmic-swingset): only search for the `vatconfig` on init
pick cd2779e96 fix(upgrade-test): update for new file locations
label Agoric-mfig-swup-core-proposals
reset base-Agoric-mfig-swup-core-proposals
merge -C 35e67bed9 Agoric-mfig-swup-core-proposals # Merge pull request #8112 from Agoric/mfig-swup-core-proposals

# Branch Agoric-ta-tsconfig
label base-Agoric-ta-tsconfig
pick 68e6e5adc build: rename jsconfig to tsconfig
pick 03aed67ea build: find-replace jsconfig
pick bdc87974d ci: simplify lint:types
pick 87e77df31 ci(types): minimal compilerOptions in tsconfig
label Agoric-ta-tsconfig
reset base-Agoric-ta-tsconfig
merge -C 6de5f1d1f Agoric-ta-tsconfig # Merge pull request #8179 from Agoric/ta/tsconfig

# Branch Agoric-4645-end-cycles
label base-Agoric-4645-end-cycles
pick cacfd6468 ci: error on any 'dependency' cycles
pick b735591b5 chore(types): improve coverage
pick 31d8d6c7e chore(types): package references
pick d4e8345ec feat: print path on loadSwingsetConfigFile failure
pick 206b57012 refactor: move down UnguardedHelperI
pick fcac65a03 refactor: raise mockPsmBootstrapArgs
pick 24a29de9a test: decouple smartWallet from vats
pick 2e1ead739 test: move PSM reviver next to PSM
pick 3f3871227 refactor: move provisionPool to inter-protocol
pick 4dbe82640 docs: need to end inter-package fs references
pick feefe9bab build: drop dep on inter-protocol
pick 6a69b0e09 build: drop vats dependency
pick 7453fa322 ci: reject package cycles
label Agoric-4645-end-cycles
reset base-Agoric-4645-end-cycles
merge -C 8169e6c7d Agoric-4645-end-cycles # Merge pull request #8153 from Agoric/4645-end-cycles

# Branch Agoric-4645-fix-deployment-test
label base-Agoric-4645-fix-deployment-test
pick f0b3cec96 chore(types): ambients hint
label Agoric-4645-fix-deployment-test
reset base-Agoric-4645-fix-deployment-test
merge -C 872bb3be2 Agoric-4645-fix-deployment-test # Merge pull request #8181 from Agoric/4645-fix-deployment-test

# Branch Agoric-ta-fix-cosmic-builders
label base-Agoric-ta-fix-cosmic-builders
pick 36a8c4837 build: fix cosmic-swing dep on builders
pick c7380a79d test: move start-local-chain to agoric-cli
label Agoric-ta-fix-cosmic-builders
reset base-Agoric-ta-fix-cosmic-builders
merge -C 9de97aba9 Agoric-ta-fix-cosmic-builders # Merge pull request #8183 from Agoric/ta/fix-cosmic-builders

# Branch Agoric-8123-dropOnly
label base-Agoric-8123-dropOnly
pick 000db1133 test: remove an inadvertent test.only addition
label Agoric-8123-dropOnly
reset base-Agoric-8123-dropOnly
merge -C 7bfadd33d Agoric-8123-dropOnly # Merge pull request #8187 from Agoric/8123-dropOnly

# Branch Agoric-8105-export-mode-replay
label base-Agoric-8105-export-mode-replay
pick 9939ea699 fix(swing-store): add 'replay' artifactMode, make export more strict
pick bd49484e5 fix(cosmic-swingset): backwards param compat in import/export
label Agoric-8105-export-mode-replay
reset base-Agoric-8105-export-mode-replay
merge -C c6d8a278a Agoric-8105-export-mode-replay # Merge pull request #8170 from Agoric/8105-export-mode-replay

# Branch Agoric-mhofman-8081-fix-state-sync
label base-Agoric-mhofman-8081-fix-state-sync
pick 0f01712ca feat(cosmic-swingset): replace import/export options
pick 6ab24b299 fix(x/swingset): switch export/import to replay artifact level
pick b4f3e2245 chore(x/vstorage): add remove entries method
pick 4fc01134f feat(cosmic-swingset): add repair-metadata snapshot restore option
pick a0389b887 feat(cosmos): fix and migrate swing-store
pick 38ac134e3 feat(deployment): add state-sync to upgrade 11 test
label Agoric-mhofman-8081-fix-state-sync
reset base-Agoric-mhofman-8081-fix-state-sync
merge -C f2445bcb4 Agoric-mhofman-8081-fix-state-sync # Merge pull request #8143 from Agoric/mhofman/8081-fix-state-sync

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants