From ad7808325a1509c87a3d7f0ed19a8e12feda6886 Mon Sep 17 00:00:00 2001
From: nicosampler <nf.dominguez.87@gmail.com>
Date: Tue, 22 Oct 2024 12:05:37 -0300
Subject: [PATCH] fix(website): CAN-602

Remove deployTxHash in build step
---
 .../features/Deploy/QueueFromGitOpsPage.tsx   | 18 +++++---
 packages/website/src/hooks/cannon.ts          | 45 ++++++++++++++-----
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx b/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx
index ec8a06927..52ce8c23d 100644
--- a/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx
+++ b/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx
@@ -930,10 +930,18 @@ export default function QueueFromGitOps() {
               >
                 {deployer.queuedTransactions.length === 0 ? (
                   <VStack>
-                    <Text color="gray.300" mb="4">
-                      Some transactions should be executed outside the safe
-                      before staging. You can execute these now in your browser.
-                      By clicking the button below.
+                    <Text color="gray.300">
+                      The following steps should be executed outside the safe
+                      before staging.
+                      {buildState.result?.deployerSteps.map((s) => (
+                        <Text color="gray.300" ml="2" key={s.name}>
+                          - {s.name}
+                        </Text>
+                      ))}
+                      <Text color="gray.300" mb="4">
+                        You can execute these now in your browser. By clicking
+                        the button below.
+                      </Text>
                     </Text>
                     <Button
                       onClick={() =>
@@ -984,7 +992,7 @@ export default function QueueFromGitOps() {
             stager.safeTxn && (
               <Box mt="4" mb="4">
                 <Heading size="sm" mb={2}>
-                  Transactions
+                  Safe Transactions:
                 </Heading>
                 {buildState.result?.safeSteps.length === 0 ? (
                   <AlertCannon borderless status="info">
diff --git a/packages/website/src/hooks/cannon.ts b/packages/website/src/hooks/cannon.ts
index 51f3221a1..56641eb8a 100644
--- a/packages/website/src/hooks/cannon.ts
+++ b/packages/website/src/hooks/cannon.ts
@@ -26,6 +26,7 @@ import {
   PackageReference,
   publishPackage,
   findUpgradeFromPackage,
+  ChainBuilderContext,
 } from '@usecannon/builder';
 import _ from 'lodash';
 import { useEffect, useReducer, useState } from 'react';
@@ -215,20 +216,44 @@ export function useCannonBuildTmp(safe: SafeDefinition | null) {
 
     const skippedSteps: StepExecutionError[] = [];
 
-    currentRuntime.on(Events.PostStepExecute, (stepType: string, stepLabel: string, stepOutput: ChainArtifacts) => {
-      const stepName = `${stepType}.${stepLabel}`;
+    currentRuntime.on(
+      Events.PostStepExecute,
+      (
+        stepType: string,
+        stepLabel: string,
+        stepOutput: ChainArtifacts,
+        _ctx: ChainBuilderContext,
+        result: ChainArtifacts
+      ) => {
+        const stepName = `${stepType}.${stepLabel}`;
 
-      addLog('info', `cannon.ts: on Events.PostStepExecute operation ${stepName} output: ${JSON.stringify(stepOutput)}`);
-
-      //simulatedSteps.push(_.cloneDeep(stepOutput));
+        addLog('info', `cannon.ts: on Events.PostStepExecute operation ${stepName} output: ${JSON.stringify(stepOutput)}`);
 
-      for (const txn in stepOutput.txns || {}) {
         // clean out txn hash
-        stepOutput.txns![txn].hash = '';
-      }
+        for (const txn in stepOutput.txns || {}) {
+          stepOutput.txns![txn].hash = '';
+        }
 
-      dispatch({ message: `Building ${stepName}...` });
-    });
+        // clean out deploy txn hash
+        if (result.contracts) {
+          const contractKey = Object.keys(result.contracts)[0];
+          if (result.contracts[contractKey]?.deployTxnHash) {
+            result.contracts[contractKey].deployTxnHash = '';
+          }
+        }
+
+        // clean out deploy txn hash
+        if (result.imports) {
+          const stepKey = Object.keys(result.imports)[0];
+          const contractKey = Object.keys(result.imports[stepKey].contracts || {})[0];
+          if (result.imports[stepKey].contracts?.[contractKey]?.deployTxnHash) {
+            result.imports[stepKey].contracts[contractKey].deployTxnHash = '';
+          }
+        }
+
+        dispatch({ message: `Building ${stepName}...` });
+      }
+    );
 
     currentRuntime.on(Events.SkipDeploy, (stepName: string, err: Error) => {
       addLog('error', `cannon.ts: on Events.SkipDeploy error ${err.toString()} happened on the operation ${stepName}`);