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.

Sign up for GitHub

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

Jump to bottom

chore: upgrade-18 cherry-picks round 2 #10460

Merged
merged 4 commits into from
Nov 19, 2024
Merged

chore: upgrade-18 cherry-picks round 2 #10460

merged 4 commits into from
Nov 19, 2024

Conversation

mujahidkay
Copy link
Member

@mujahidkay mujahidkay commented Nov 13, 2024 •
edited
Loading

Description

Cherry-picks the following commits from master:

Also adds a new upgrade name agoric-upgrade-18-basic-2. Also, moves provisioning GOV4 from USE to PREPARE.

used git cherry-pick for the above commits

Draft PR with reapply upgrade on top of rc0

@mujahidkay mujahidkay requested a review from a team as a code owner November 13, 2024 10:42
@mujahidkay mujahidkay self-assigned this Nov 13, 2024
@mujahidkay mujahidkay added the force:integration Force integration tests to run on PR label Nov 13, 2024
mhofman
mhofman reviewed Nov 13, 2024
View reviewed changes
Copy link
Member

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

Is there a draft PR where we can see a reapply of the upgrade on top of rc0 to verify it would fix emerynet?

golang/cosmos/app/upgrade.go
@@ -18,6 +18,7 @@ var upgradeNamesOfThisVersion = []string{
"agoric-upgrade-18-devnet",
"agoric-upgrade-18-emerynet",
"agoric-upgrade-18-basic",
"agoric-upgrade-18-basic-2",
Copy link
Member

Choose a reason for hiding this comment

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

While it doesn't change the behavior, we should have this new name return false in isPrimaryUpgradeName

Copy link
Member

Choose a reason for hiding this comment

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

I'm also wondering if we should bikeshed the name as it's not really like basic or meant to be applied on its own

Copy link
Member Author

@mujahidkay mujahidkay Nov 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm also wondering if we should bikeshed the name as it's not really like basic or meant to be applied on its own

what do you suggest?

Copy link
Member

Choose a reason for hiding this comment

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

agoric-upgrade-18-reapply ? But honestly we can keep as is too.

@mujahidkay
Copy link
Member Author

mujahidkay commented Nov 13, 2024 •
edited
Loading

Is there a draft PR where we can see a reapply of the upgrade on top of rc0 to verify it would fix emerynet?

I can work on this today, and then attach it to this PR's description

@cloudflare-workers-and-pages Cloudflare Workers and Pages
Copy link

cloudflare-workers-and-pages bot commented Nov 18, 2024 •
edited
Loading

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: f0dca14
Status: ✅  Deploy successful!
Preview URL: https://8075c1ad.agoric-sdk.pages.dev
Branch Preview URL: https://mk-u18-cherrypick-round2.agoric-sdk.pages.dev

View logs

mhofman
mhofman approved these changes Nov 19, 2024
View reviewed changes
Copy link
Member

@mhofman mhofman left a comment

Choose a reason for hiding this comment

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

Given the passing tests in #10484, LGTM, but before merging I would like to see the node ./addGov4 moved to prepare.sh to keep verifying in a3p-integration that we have indeed fixed the problem we had in the first place.

golang/cosmos/app/upgrade.go
@@ -18,6 +18,7 @@ var upgradeNamesOfThisVersion = []string{
"agoric-upgrade-18-devnet",
"agoric-upgrade-18-emerynet",
"agoric-upgrade-18-basic",
"agoric-upgrade-18-basic-2",
Copy link
Member

Choose a reason for hiding this comment

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

agoric-upgrade-18-reapply ? But honestly we can keep as is too.

@mujahidkay
Copy link
Member Author

Given the passing tests in #10484, LGTM, but before merging I would like to see the node ./addGov4 moved to prepare.sh to keep verifying in a3p-integration that we have indeed fixed the problem we had in the first place.

Good idea.

@mujahidkay
Copy link
Member Author

mujahidkay commented Nov 19, 2024 •
edited
Loading

Given the passing tests in #10484, LGTM, but before merging I would like to see the node ./addGov4 moved to prepare.sh to keep verifying in a3p-integration that we have indeed fixed the problem we had in the first place.

@mhofman Did a run (passing) with this: https://github.com/Agoric/agoric-sdk/actions/runs/11914640186/job/33203061974?pr=10526

@mujahidkay mujahidkay merged commit b9b8db4 into dev-upgrade-18 Nov 19, 2024
79 checks passed
@mujahidkay mujahidkay deleted the mk/u18-cherrypick-round2 branch November 19, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chris-Hibbert Chris-Hibbert Chris-Hibbert approved these changes

@mhofman mhofman mhofman approved these changes

@thams thams Awaiting requested review from thams thams is a code owner automatically assigned from Agoric/engprodexec

@gibson042 gibson042 Awaiting requested review from gibson042

Assignees

@mujahidkay mujahidkay

Labels
force:integration Force integration tests to run on PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mujahidkay @mhofman @Chris-Hibbert @frazarshad