diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go index a0f1af19c56..dc0a4cf533d 100644 --- a/golang/cosmos/app/upgrade.go +++ b/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", "agoric-upgrade-18-a3p", } diff --git a/packages/inter-protocol/src/proposals/add-auction.js b/packages/inter-protocol/src/proposals/add-auction.js index abecb842390..6814fbdcc87 100644 --- a/packages/inter-protocol/src/proposals/add-auction.js +++ b/packages/inter-protocol/src/proposals/add-auction.js @@ -33,7 +33,6 @@ export const addAuction = async ( chainStorage, chainTimerService, economicCommitteeCreatorFacet: electorateCreatorFacet, - econCharterKit, governedContractKits: governedContractKitsP, priceAuthority8400, zoe, @@ -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 diff --git a/packages/telemetry/src/slog-to-otel.js b/packages/telemetry/src/slog-to-otel.js index 87b36fd269d..bf91db575aa 100644 --- a/packages/telemetry/src/slog-to-otel.js +++ b/packages/telemetry/src/slog-to-otel.js @@ -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');