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

feat(cosmos): Next upgrade is agoric-upgrade-18 #10361

Merged
merged 4 commits into from
Oct 31, 2024

Conversation

mujahidkay
Copy link
Member

Description

Bumps the upgrade handler in golang/cosmos and renames a3p-integration/proposals/n:upgrade-next -> a3p-integration/proposals/a:upgrade-18 as per the naming conventions.
agoricSyntheticChain already points to use-upgrade-17 and not sure about s:stake-bld and z:acceptance so have left them as is.

Security Considerations

n/a

Scaling Considerations

n/a

Documentation Considerations

Will be provided with full release

Testing Considerations

a3p-integration tests already included

Upgrade Considerations

next chain software upgrade

@mujahidkay mujahidkay self-assigned this Oct 29, 2024
Comment on lines 19 to 18
"UNRELEASED_main",
"UNRELEASED_devnet",
"UNRELEASED_REAPPLY",
"agoric-upgrade-18",
"agorictest-upgrade-18",
Copy link
Member

Choose a reason for hiding this comment

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

Are we not releasing variants for price feed purposes?

Copy link
Member Author

Choose a reason for hiding this comment

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

as per my understanding, both replace-electorate-core.js and updatePriceFeeds.js used the same variants. But now that I have double-checked, updatePriceFeeds isn't using MAINNET and DEVNET as keys in its configuration.

const configurations = {
  A3P_INTEGRATION: {
    oracleAddresses: [
      'agoric1ee9hr0jyrxhy999y755mp862ljgycmwyp4pl7q', // GOV1
      'agoric1wrfh296eu2z34p6pah7q04jjuyj3mxu9v98277', // GOV2
      'agoric1ydzxwh6f893jvpaslmaz6l8j2ulup9a7x8qvvq', // GOV3
    ],
    inBrandNames: ['ATOM', 'stATOM'],
  },
  main: {
    oracleAddresses: [
      'agoric144rrhh4m09mh7aaffhm6xy223ym76gve2x7y78', // DSRV
      'agoric19d6gnr9fyp6hev4tlrg87zjrzsd5gzr5qlfq2p', // Stakin
      'agoric19uscwxdac6cf6z7d5e26e0jm0lgwstc47cpll8', // 01node
      'agoric1krunjcqfrf7la48zrvdfeeqtls5r00ep68mzkr', // Simply Staking
      'agoric1n4fcxsnkxe4gj6e24naec99hzmc4pjfdccy5nj', // P2P
    ],
    inBrandNames: ['ATOM', 'stATOM', 'stOSMO', 'stTIA', 'stkATOM'],
    contractTerms: { minSubmissionCount: 3 },
  },
  devnet: {
    oracleAddresses: [
      'agoric1lw4e4aas9q84tq0q92j85rwjjjapf8dmnllnft', // DSRV
      'agoric1zj6vrrrjq4gsyr9lw7dplv4vyejg3p8j2urm82', // Stakin
      'agoric1ra0g6crtsy6r3qnpu7ruvm7qd4wjnznyzg5nu4', // 01node
      'agoric1qj07c7vfk3knqdral0sej7fa6eavkdn8vd8etf', // Simply Staking
      'agoric10vjkvkmpp9e356xeh6qqlhrny2htyzp8hf88fk', // P2P
    ],
    inBrandNames: ['ATOM', 'stTIA', 'stkATOM'],
  },
};

so the variant name from getVariantFromUpgradeName wouldn't work for price feeds on devnet and mainnet. What do you think?

Copy link
Member

Choose a reason for hiding this comment

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

@Chris-Hibbert can you clarify?

Copy link
Contributor

Choose a reason for hiding this comment

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

I've created #10363 to repair this.

@mhofman
Copy link
Member

mhofman commented Oct 29, 2024

not sure about s:stake-bld

@turadg is this a sort of integration test, or planned future core eval. If the latter we should remove from this branch.

z:acceptance

That definitely should stay in this, that layer is purely for integration tests.

Copy link

cloudflare-workers-and-pages bot commented Oct 29, 2024

Deploying agoric-sdk with  Cloudflare Pages  Cloudflare Pages

Latest commit: bcf26e0
Status: ✅  Deploy successful!
Preview URL: https://35980a38.agoric-sdk.pages.dev
Branch Preview URL: https://init-upgrade-18.agoric-sdk.pages.dev

View logs

@turadg
Copy link
Member

turadg commented Oct 29, 2024

not sure about s:stake-bld

@turadg is this a sort of integration test, or planned future core eval. If the latter we should remove from this branch.

Integration test, to verify that when someone does make a proposal using Orchestration that it'll work. I suppose it should be part of z:acceptance so that we always know it'll work after all pending upgrades.

cc @anilhelvaci

@mujahidkay mujahidkay force-pushed the init-upgrade-18 branch 2 times, most recently from 5c2f631 to 71a01b9 Compare October 30, 2024 06:44
Comment on lines 107 to 108
default:
return ""
Copy link
Member Author

@mujahidkay mujahidkay Oct 30, 2024

Choose a reason for hiding this comment

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

Should we keep this or remove as we do in isPrimaryUpgradeName? To be fair, we would never reach this case as it will be short-circuited in upgrade18Handler before getVariantFromUpgradeName has a chance to get invoked

Copy link
Member

Choose a reason for hiding this comment

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

I think it doesn't cost much to keep.

@mujahidkay mujahidkay added the force:integration Force integration tests to run on PR label Oct 30, 2024
case "UNRELEASED_A3P_INTEGRATION":
switch upgradeName {
case "agoric-upgrade-18":
return "MAINNET"
Copy link
Contributor

Choose a reason for hiding this comment

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

So this is the reason why tests are failing, right?
@mujahidkay

It should be a3p plan variant instead of MAINNET. And you will be updating the planName in a3p proposal json file as well. Did I get it right?

Comment on lines +111 to 112
case "agoric-upgrade-18-basic":
return ""
Copy link
Member

Choose a reason for hiding this comment

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

Please gofmt

@mujahidkay mujahidkay marked this pull request as ready for review October 31, 2024 13:26
@mujahidkay mujahidkay requested a review from a team as a code owner October 31, 2024 13:26
Comment on lines 107 to 108
default:
return ""
Copy link
Member

Choose a reason for hiding this comment

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

I think it doesn't cost much to keep.

@mujahidkay mujahidkay merged commit 6ddbef0 into dev-upgrade-18 Oct 31, 2024
88 checks passed
@mujahidkay mujahidkay deleted the init-upgrade-18 branch October 31, 2024 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
force:integration Force integration tests to run on PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants