rebase/cherry-pick commits for upgrade 12 #8510
Merged
Conversation
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
mhofman
force-pushed
the
mhofman/cherry-pick-upgrade-12
branch
from
863a847 to
3dda414
Compare
Base automatically changed from
mhofman/fix-npm-latest-round-2
to
release-mainnet1B
November 9, 2023 19:45
fix(vibc): accommodate ibc-go v3 breaking changes
Porting upgrade tests to Javascript
test: separate upgrade-12
…gset-upgrade-plan Atomic swingset upgrade actions
use `exec -it` to get a shell
Agoric Upgrade 11 Tests -> JS
Co-authored-by: Ikenna Omekam <ikenna@agoric.com>
…tion fix(vstorage)!: Enforce path validation
The second tests fails if I comment out the #8423 fix, as expected.
test: remove tmux from upgrade-tests
…ction fix(swing-store): ensure crank savepoint is wrapped in transaction
* feat(cosmic-swingset): add being block check and transaction * fixup! feat(cosmic-swingset): add being block check and transaction --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
chore(cosmos): update max block size
Pick up fix for state-sync extension payload size
ci(install-deps): work around Ansible PPA breakage
To avoid conflicts with long standing release branches and their special CI treatment, use another branch name Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
gibson042
reviewed
Nov 9, 2023
There was a problem hiding this comment.
I confirm that the claimed git-rebase-todo is able to produce the resulting commit history and file state.
# 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-execa-proto
label base-Agoric-execa-proto
pick 84f2e6fe3 feat: port bash tests to javascript
label Agoric-execa-proto
reset base-Agoric-execa-proto
merge -C a3d49e541 Agoric-execa-proto # Merge pull request #8145 from Agoric/execa-proto
# Branch Agoric-ta-upgrade-12
label base-Agoric-ta-upgrade-12
pick b05504739 test: separate upgrade-12
label Agoric-ta-upgrade-12
reset base-Agoric-ta-upgrade-12
merge -C 9f085d34e Agoric-ta-upgrade-12 # Merge pull request #8254 from Agoric/ta/upgrade-12
# Partial Branch Agoric-mhofman-8279-atomic-swingset-upgrade-plan
label base-Agoric-mhofman-8279-atomic-swingset-upgrade-plan
pick e8665cbbf chore(deployment): add test of core proposal execution
pick b1e98d266 chore(deployment): shortcut to run upgrade test non-interactive
label Agoric-mhofman-8279-atomic-swingset-upgrade-plan
reset base-Agoric-mhofman-8279-atomic-swingset-upgrade-plan
merge -c 52bc8ecac Agoric-mhofman-8279-atomic-swingset-upgrade-plan # Merge partial pull request #8287 from Agoric/mhofman/8279-atomic-swingset-upgrade-plan
# Branch Agoric-agoric-upgrade-11-js
label base-Agoric-agoric-upgrade-11-js
pick c5f7be4a3 test: move ag11 and ag12 to JS
label Agoric-agoric-upgrade-11-js
reset base-Agoric-agoric-upgrade-11-js
merge -C 2ee239fb5 Agoric-agoric-upgrade-11-js # Merge pull request #8237 from Agoric/agoric-upgrade-11-js
# Branch Agoric-gibson-8337-vstorage-path-validation
label base-Agoric-gibson-8337-vstorage-path-validation
pick 03871e842 fix(vstorage)!: Enforce path validation
pick 17b163490 chore(vstorage): Improve path/key testing
pick 1d124598e refactor(vstorage): Improve custom query handling
label Agoric-gibson-8337-vstorage-path-validation
reset base-Agoric-gibson-8337-vstorage-path-validation
merge -C dafc7c170 Agoric-gibson-8337-vstorage-path-validation # Merge pull request #8348 from Agoric/gibson-8337-vstorage-path-validation
# Branch Agoric-drop-tmux
label base-Agoric-drop-tmux
pick a97528a65 test: remove tmux from upgrade-tests
pick 0ecffd275 feat(Docker): make shell Co-authored-by: Ikenna Omekam <ikenna@agoric.com>
label Agoric-drop-tmux
reset base-Agoric-drop-tmux
merge -C 4ffd2ad95 Agoric-drop-tmux # Merge pull request #8393 from Agoric/drop-tmux
# Branch Agoric-mhofman-8423-crank-ensure-transaction
label base-Agoric-mhofman-8423-crank-ensure-transaction
pick 9d2dd3f99 fix(swing-store): ensure crank savepoint is wrapped in transaction
pick cc742b8a4 test: add test of savepoints, including no automatic transactions
label Agoric-mhofman-8423-crank-ensure-transaction
reset base-Agoric-mhofman-8423-crank-ensure-transaction
merge -C b9a5cb442 Agoric-mhofman-8423-crank-ensure-transaction # Merge pull request #8429 from Agoric/mhofman/8423-crank-ensure-transaction
# Pull Request #8432
pick a9d113a09 feat(cosmic-swingset): add begin block check and transaction (#8432)
# Pull Request #8455
pick 0e22bfac3 SECURITY.md updates and ownership (#8455)
# Branch Agoric-mhofman-max-block-size
label base-Agoric-mhofman-max-block-size
pick 3b204c64c chore(cosmos): update tendermint to v0.34.23-alpha.agoric.4
pick e33cd4f18 chore(cosmos): reflect new default max block size in upgrade
pick 5fb633452 chore: add upgrade test of max block size
label Agoric-mhofman-max-block-size
reset base-Agoric-mhofman-max-block-size
merge -C de3efa558 Agoric-mhofman-max-block-size # Merge pull request #8484 from Agoric/mhofman/max-block-size
# Pull Request #8507
pick cd437efa0 chore(cosmos): update cosmos-sdk (#8507)
# Branch Agoric-8443-drop-upgrade-tests
label base-Agoric-8443-drop-upgrade-tests
pick a3e32a95c ci: build upgrade image from agoric-3-proposals
pick 9c3a92bc4 ci: remove ag0 considerations
pick c7958f2d0 ci: always USE_JS for chain upgrade test
pick 45cf5cee4 ci: voteLatestProposalAndWait poll patiently
pick 9b461c227 test: fix upgrade-12 expected vault count
pick ba753895b ci: skip TAP timing collection for docker-build-sdk
pick fec5cc1ee ci: Zoe test failing for now
pick 214667fc0 ci: disable upgrade-12 actions that aren't working
label Agoric-8443-drop-upgrade-tests
reset base-Agoric-8443-drop-upgrade-tests
merge -C 9b4745ac3 Agoric-8443-drop-upgrade-tests # Merge pull request #8476 from Agoric/8443-drop-upgrade-tests
# Manually authored
pick 3dda414ff chore(deployment): test upgrade-12 does not have core proposal
# Partial Branch Agoric-mfig-install-ansible-workaround
label base-Agoric-mfig-install-ansible-workaround
pick 9367c8247 ci(install-deps): work around Ansible Launchpad PPA breakage
label Agoric-mfig-install-ansible-workaround
reset base-Agoric-mfig-install-ansible-workaround
merge -C 27f1b371b Agoric-mfig-install-ansible-workaround # Merge pull request #8515 from Agoric/mfig-install-ansible-workaround
# Pull Request #8375
pick cdd20f740 chore: change branch name used for creating releases (#8375)
# TODO: Consider porting the CI changes over too
But will pair up soon to validate that the changes match expectations.
Comment on lines
+59
to
+66
| apt-get install -y rsync curl sudo gnupg2 jq libbsd-dev | ||
| if apt-get install -y ansible; then : # success | ||
| else | ||
| # Failed to install Ansible, try workaround based on | ||
| # https://github.com/ansible-community/ppa/issues/77#issuecomment-1802847056 | ||
| sed -i -e '1s/^[^#]*//' /usr/lib/python3/dist-packages/ansible_collections/netapp/ontap/plugins/modules/na_ontap_s3_users.py | ||
| apt-get install -y --fix-broken | ||
| fi |
There was a problem hiding this comment.
Not a problem, but this is strange indentation.
| t.context.bundleIds = await installBundles(bundlesData); | ||
| }); | ||
|
|
||
| test.skip('Open Vaults', async t => { |
There was a problem hiding this comment.
Why are all the tests in this file and packages/deployment/upgrade-test/upgrade-test-scripts/agoric-upgrade-12/post.test.js skipped?
gibson042
reviewed
Nov 9, 2023
| // We need to emit a channel event to notify the relayer. | ||
| ctx.EventManager().EmitEvents(sdk.Events{ | ||
| sdk.NewEvent( | ||
| sdk.EventTypeMessage, | ||
| sdk.NewAttribute(sdk.AttributeKeyModule, channeltypes.AttributeValueCategory), | ||
| ), | ||
| }) | ||
| k.channelKeeper.WriteOpenInitChannel(ctx, portID, channelID, order, connectionHops, counterparty, version) |
There was a problem hiding this comment.
@michaelfig please verify that this is good to include.
There was a problem hiding this comment.
Yes, please! This is a critical platform fix whose absence would prevent the use of dIBC in JS contracts.
gibson042
approved these changes
Nov 9, 2023
Disable journaling and full synchronous pragma modes during import
feat(swing-store): faster import of swing-store
mhofman
force-pushed
the
mhofman/cherry-pick-upgrade-12
branch
from
7fe5bb8 to
11637d2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes: #8511
This is a PR staging rebases of some master branch PRs towards an upgrade-12.
It was performed with the following interactive rebase onto the
release-mainnet1Bbranch (currently ontomhofman/fix-npm-latest-round-2until #8390 lands), and some minor conflict resolutions:For reference, the non-pruned rebase-todo of the master commits since the one generated for upgrade-11 (#8159 (comment)):
rebase-todo since upgrade-11