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

Open
wants to merge 3 commits into
base: dev-upgrade-18
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
185b7d4
fix: remove addInstance call from add-auction.js
frazarshad Nov 12, 2024
3915a34
chore: add new non-primary upgrade name
Nov 12, 2024
bdf4cd3
fix(telemetry): add missing slog type
Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions golang/cosmos/app/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?

"agoric-upgrade-18-a3p",
}

Expand Down
9 changes: 0 additions & 9 deletions packages/inter-protocol/src/proposals/add-auction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ export const addAuction = async (
chainStorage,
chainTimerService,
economicCommitteeCreatorFacet: electorateCreatorFacet,
econCharterKit,
governedContractKits: governedContractKitsP,
priceAuthority8400,
zoe,
Expand Down Expand Up @@ -184,14 +183,6 @@ export const addAuction = async (
produceAuctioneerKit.reset();
produceAuctioneerKit.resolve(kit);

// introduce economic committee charter to new auctioneer
// cf addGovernorsToEconCharter() in committee-proposal.js
await E(E.get(econCharterKit).creatorFacet).addInstance(
kit.instance,
kit.governorCreatorFacet,
kit.label,
);

auctionInstance.reset();
await auctionInstance.resolve(governedInstance);
// belt and suspenders; the above is supposed to also do this
Expand Down
5 changes: 5 additions & 0 deletions packages/telemetry/src/slog-to-otel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,11 @@ export const makeSlogToOtelKit = (tracer, overrideAttrs = {}) => {
spans.pop('timer-poll');
break;
}
case 'cosmic-swinget-inject-kernel-upgrade-events': {
spans.push('kernel-upgrade-events');
spans.pop('kernel-upgrade-events');
break;
}
case 'cosmic-swingset-install-bundle': {
spans.push(['install-bundle', slogAttrs.endoZipBase64Sha512]);
spans.pop('install-bundle');
Expand Down
Loading