From 01d95b2d124bf53f1f25bfac6f436cdd570b514d Mon Sep 17 00:00:00 2001
From: Pierre Bertet <hi@bpier.re>
Date: Fri, 13 Sep 2024 18:05:28 +0100
Subject: [PATCH] Add WethZapper and GasCompZapper to the deployment context &
 env vars

---
 contracts/utils/deploy-cli.ts                      | 4 +++-
 contracts/utils/deployment-artifacts-to-app-env.ts | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contracts/utils/deploy-cli.ts b/contracts/utils/deploy-cli.ts
index 0582bb34..1d031a56 100644
--- a/contracts/utils/deploy-cli.ts
+++ b/contracts/utils/deploy-cli.ts
@@ -209,20 +209,22 @@ Deploying Liquity contracts with the following settings:
   const { deployer, ...safeOptions } = options;
 
   const protocolContracts = {
-    WETHTester: deploymentManifest.branches[0].collToken as string,
     BoldToken: deploymentManifest.boldToken as string,
     CollateralRegistry: deploymentManifest.collateralRegistry as string,
     HintHelpers: deploymentManifest.hintHelpers as string,
     MultiTroveGetter: deploymentManifest.multiTroveGetter as string,
+    WETHTester: deploymentManifest.branches[0].collToken as string,
   };
 
   const collateralContracts = (deploymentManifest.branches as any[]).map((branch) => ({
     activePool: branch.activePool as string,
     borrowerOperations: branch.borrowerOperations as string,
+    gasCompZapper: branch.gasCompZapper as string,
     sortedTroves: branch.sortedTroves as string,
     stabilityPool: branch.stabilityPool as string,
     token: branch.collToken as string,
     troveManager: branch.troveManager as string,
+    wethZapper: branch.wethZapper as string,
   }));
 
   // write env file
diff --git a/contracts/utils/deployment-artifacts-to-app-env.ts b/contracts/utils/deployment-artifacts-to-app-env.ts
index c51cf500..6703dcea 100644
--- a/contracts/utils/deployment-artifacts-to-app-env.ts
+++ b/contracts/utils/deployment-artifacts-to-app-env.ts
@@ -37,10 +37,12 @@ const ZDeploymentContext = z.object({
     z.object({
       activePool: ZAddress,
       borrowerOperations: ZAddress,
+      gasCompZapper: ZAddress,
       sortedTroves: ZAddress,
       stabilityPool: ZAddress,
       token: ZAddress,
       troveManager: ZAddress,
+      wethZapper: ZAddress,
     }),
   ),
   protocolContracts: z.object({
@@ -169,6 +171,10 @@ function contractNameToAppEnvVariable(contractName: string, prefix: string = "")
       return `${prefix}_TOKEN`;
     case "troveManager":
       return `${prefix}_TROVE_MANAGER`;
+    case "wethZapper":
+      return `${prefix}_WETH_ZAPPER`;
+    case "gasCompZapper":
+      return `${prefix}_GAS_COMP_ZAPPER`;
   }
   return null;
 }