From 185b7d4d6a396aff50ca02c1ba4819b7db13863f Mon Sep 17 00:00:00 2001
From: Fraz Arshad <fraz.arshad12@gmail.com>
Date: Tue, 12 Nov 2024 20:12:59 +0500
Subject: [PATCH 1/3] fix: remove addInstance call from add-auction.js

---
 packages/inter-protocol/src/proposals/add-auction.js | 9 ---------
 1 file changed, 9 deletions(-)

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

From 3915a348157d7a1319ce905764cc055291202638 Mon Sep 17 00:00:00 2001
From: mujahid <mujahid@agoric.com>
Date: Wed, 13 Nov 2024 04:56:24 +0500
Subject: [PATCH 2/3] chore: add new non-primary upgrade name

---
 golang/cosmos/app/upgrade.go | 1 +
 1 file changed, 1 insertion(+)

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",
 }
 

From bdf4cd3eabe9339c1d0a1abab178e03139de7ae6 Mon Sep 17 00:00:00 2001
From: mujahid <mujahid@agoric.com>
Date: Wed, 13 Nov 2024 04:34:49 +0500
Subject: [PATCH 3/3] fix(telemetry): add missing slog type

---
 packages/telemetry/src/slog-to-otel.js | 5 +++++
 1 file changed, 5 insertions(+)

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');