From d8893590a8f6f7b1d0a60279a6a2bc9fd0b5c154 Mon Sep 17 00:00:00 2001
From: spypsy <spypsy@users.noreply.github.com>
Date: Fri, 1 Dec 2023 20:22:47 +0000
Subject: [PATCH] fix(ci): remove unused ADDRESS vars & export private key vars
 (#3520)

---
 .circleci/config.yml                          |  2 ++
 .../aztec-node/terraform/variables.tf         | 22 ++++---------------
 .../p2p/src/service/libp2p_service.ts         |  2 +-
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bebe84ddd2..fea313dd0c5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1014,6 +1014,8 @@ jobs:
             export TF_VAR_BOOTNODE_2_PEER_ID=$BOOTNODE_2_PEER_ID
             export TF_VAR_BOOTNODE_1_PRIVATE_KEY=$BOOTNODE_1_PRIVATE_KEY
             export TF_VAR_BOOTNODE_2_PRIVATE_KEY=$BOOTNODE_2_PRIVATE_KEY
+            export TF_VAR_SEQ_1_PUBLISHER_PRIVATE_KEY=$SEQ_1_PUBLISHER_PRIVATE_KEY
+            export TF_VAR_SEQ_2_PUBLISHER_PRIVATE_KEY=$SEQ_2_PUBLISHER_PRIVATE_KEY
             deploy_terraform p2p-bootstrap yarn-project/p2p-bootstrap/terraform
             deploy_terraform aztec-node yarn-project/aztec-node/terraform
             deploy_terraform aztec-faucet yarn-project/aztec-faucet/terraform
diff --git a/yarn-project/aztec-node/terraform/variables.tf b/yarn-project/aztec-node/terraform/variables.tf
index f8c10fefd2c..30e0f59f597 100644
--- a/yarn-project/aztec-node/terraform/variables.tf
+++ b/yarn-project/aztec-node/terraform/variables.tf
@@ -6,22 +6,6 @@ variable "API_KEY" {
   type = string
 }
 
-variable "CONTRACT_DEPLOYMENT_EMITTER_ADDRESS" {
-  type = string
-}
-
-variable "ROLLUP_CONTRACT_ADDRESS" {
-  type = string
-}
-
-variable "INBOX_CONTRACT_ADDRESS" {
-  type = string
-}
-
-variable "REGISTRY_CONTRACT_ADDRESS" {
-  type = string
-}
-
 variable "SEQ_1_PUBLISHER_PRIVATE_KEY" {
   type = string
 }
@@ -54,11 +38,13 @@ variable "NODE_TCP_PORT" {
 }
 
 variable "NODE_1_PRIVATE_KEY" {
-  type = string
+  type    = string
+  default = ""
 }
 
 variable "NODE_2_PRIVATE_KEY" {
-  type = string
+  type    = string
+  default = ""
 }
 
 variable "DOCKERHUB_ACCOUNT" {
diff --git a/yarn-project/p2p/src/service/libp2p_service.ts b/yarn-project/p2p/src/service/libp2p_service.ts
index 05f3a896023..e13c7e18eda 100644
--- a/yarn-project/p2p/src/service/libp2p_service.ts
+++ b/yarn-project/p2p/src/service/libp2p_service.ts
@@ -39,7 +39,7 @@ const INITIAL_PEER_REFRESH_INTERVAL = 20000;
  * @returns The peer ID.
  */
 export async function createLibP2PPeerId(privateKey?: string) {
-  if (!privateKey) {
+  if (!privateKey?.length) {
     return await createSecp256k1PeerId();
   }
   const base64 = Buffer.from(privateKey, 'hex').toString('base64');