From e9a090b301b4ae0275643b2a5e47b67638aa488c Mon Sep 17 00:00:00 2001
From: Nathan Klick <nathan@swirldslabs.com>
Date: Mon, 17 Feb 2025 11:13:05 -0600
Subject: [PATCH 1/2] chore: ensure staking updates support multi-cluster
 deployments

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
---
 src/commands/node/tasks.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/commands/node/tasks.ts b/src/commands/node/tasks.ts
index 974d69fd8..b73f3a5f9 100644
--- a/src/commands/node/tasks.ts
+++ b/src/commands/node/tasks.ts
@@ -559,6 +559,7 @@ export class NodeCommandTasks {
     accountId: string,
     nodeAlias: NodeAlias,
     stakeAmount: number = HEDERA_NODE_DEFAULT_STAKE_AMOUNT,
+    context?: string,
   ) {
     try {
       const deploymentName = this.configManager.getFlag<DeploymentName>(flags.deployment);
@@ -567,6 +568,7 @@ export class NodeCommandTasks {
         this.parent.getClusterRefs(),
         deploymentName,
         this.configManager.getFlag<boolean>(flags.forcePortForward),
+        context,
       );
       const client = this.accountManager._nodeClient;
       const treasuryKey = await this.accountManager.getTreasuryAccountKeys(namespace);
@@ -1268,11 +1270,12 @@ export class NodeCommandTasks {
         let nodeIndex = 0;
         for (const nodeAlias of ctx.config.nodeAliases) {
           const accountId = accountMap.get(nodeAlias);
+          const context = helpers.extractContextFromConsensusNodes(nodeAlias, ctx.config.consensusNodes);
           const stakeAmount =
             stakeAmountParsed.length > 0 ? stakeAmountParsed[nodeIndex] : HEDERA_NODE_DEFAULT_STAKE_AMOUNT;
           subTasks.push({
             title: `Adding stake for node: ${chalk.yellow(nodeAlias)}`,
-            task: async () => await self._addStake(ctx.config.namespace, accountId, nodeAlias, +stakeAmount),
+            task: async () => await self._addStake(ctx.config.namespace, accountId, nodeAlias, +stakeAmount, context),
           });
           nodeIndex++;
         }
@@ -1291,13 +1294,16 @@ export class NodeCommandTasks {
   stakeNewNode() {
     const self = this;
     return new Task('Stake new node', async (ctx: any, task: ListrTaskWrapper<any, any, any>) => {
+      const context = helpers.extractContextFromConsensusNodes(ctx.config.nodeAlias, ctx.config.consensusNodes);
       await self.accountManager.refreshNodeClient(
         ctx.config.namespace,
         ctx.config.nodeAlias,
         this.parent.getClusterRefs(),
         this.configManager.getFlag<DeploymentName>(flags.deployment),
+        context,
+        this.configManager.getFlag<boolean>(flags.forcePortForward),
       );
-      await this._addStake(ctx.config.namespace, ctx.newNode.accountId, ctx.config.nodeAlias);
+      await this._addStake(ctx.config.namespace, ctx.newNode.accountId, ctx.config.nodeAlias, undefined, context);
     });
   }
 

From b4cbe074cb7a3817ee3135cf542d2838349636cc Mon Sep 17 00:00:00 2001
From: Nathan Klick <nathan@swirldslabs.com>
Date: Mon, 17 Feb 2025 11:46:07 -0600
Subject: [PATCH 2/2] fix: additional staking fixes

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
---
 src/core/account_manager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/account_manager.ts b/src/core/account_manager.ts
index b26e55d8b..3d1da6e6e 100644
--- a/src/core/account_manager.ts
+++ b/src/core/account_manager.ts
@@ -393,7 +393,7 @@ export class AccountManager {
       if (this._portForwards.length < totalNodes) {
         this._portForwards.push(
           await this.k8Factory
-            .default()
+            .getK8(networkNodeService.context)
             .pods()
             .readByRef(PodRef.of(networkNodeService.namespace, networkNodeService.haProxyPodName))
             .portForward(localPort, port),