Merge branch 'testnet-prod'

README.md

@@ -61,7 +61,7 @@
 
 ## Connext Architecture
 
-The Connext architecture can be seen as a layered system, as follows:
+The Connext architecture can be seen as a layered system, as follows :
 
 | Layer                            | Protocol/Stakeholders                  |
 | -------------------------------- | -------------------------------------- |

docker/bin/wait-for-services.sh

@@ -36,10 +36,10 @@ function wait_for_service() {
     local attempt=1
 
     until curl -f --max-time 1 "http://localhost:${PORT}/ping" &>/dev/null; do
-        echo "${attempt}/30: Service not up, sleeping ${attempt} seconds..."
+        echo "${attempt}/60: Service not up, sleeping ${attempt} seconds..."
         sleep ${attempt}
         attempt=$((attempt + 1))
-        if [[ ${attempt} == 30 ]]
+        if [[ ${attempt} == 60 ]]
         then
             echo -e "\033[31mERROR\033[m: Waited too long for ${SERVICE} to become available!"
             exit 1

ops/env/testnet/core/secrets.prod.json

@@ -21,7 +21,6 @@
 	"lighthouse_propagate_heartbeat": "ENC[AES256_GCM,data:ngWH/ENDrnuZWThozPT+NO1DWZ4eFgKH,iv:MJDorgIdm4o+vm1wgpwgqk9783sHi95sgfd0XXzStSM=,tag:3lCtngMWTyUf27+fz8yQRQ==,type:str]",
 	"lighthouse_send_outbound_root_heartbeat": "ENC[AES256_GCM,data:rK5ImySl4pZdI6Ag4sAZ84cECd/NTz1k,iv:450J2HvaXXf3p4fN1GAGFMQWRjBWKQI4KfqsiZh9gug=,tag:EE6dpf0QRLw7Z4c/RvVFSA==,type:str]",
 	"relayer_web3_signer_private_key": "ENC[AES256_GCM,data:zUtd3IiSb3GWERzM5aRQG0WInleSduWFkg6NJb/oIAJ4o4nMp1q+hWhPC2dEpma1lppbX9tkmydxAgrzr16u7MAa,iv:exruQBT5UsbagQiibyS88od/nmWHRs5wCPWetuFY4QY=,tag:G8QhkoxQYpqf0SioA/NBCQ==,type:str]",
-	"linea_node": "ENC[AES256_GCM,data:I1fqRfyk3iF0xsSd2OuyxCBdF2odFVRjYJg=,iv:sZlgP202Q7Q2gPGmefezi+8XNqWo8qV7SQzlGUHl1Ig=,tag:m7yczphoaziyedJMAL6AAg==,type:str]",
 	"optgoerli_alchemy_key_for_lh": "ENC[AES256_GCM,data:is7Xn79cWf8JIQEu5MPbdpy7kGKXmMDGbqnq5xxMinE=,iv:6UpjIqrMb0PNytb37aOH5clr4/GMVSIFGtO3T0NfYr8=,tag:JKhE5xQLR5wpMxOMscXvVQ==,type:str]",
 	"sops": {
 		"kms": [
@@ -36,8 +35,8 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2023-10-12T18:16:36Z",
-		"mac": "ENC[AES256_GCM,data:74+Bo9rq93wtubj0aXcJUwNQB+KrSDllG4HurDeqyW2mt+kkOQckWmnZmdyK9DqNvLCp+h33dp3IiJHz+ijHWrfAku3uQCSg2x/0GNNFxEH1+/SReXriP+XaVZ81CuWYgcLEqOOi7EVWl8TTBhpwBpS3QHcP4MQ6M3xX3ebBux0=,iv:jsRaEk85OzJAtT5ArvgCdCVBlPn84PhrBkU+kujq85w=,tag:rJs0Ak7ulVgheQnoh3R+XQ==,type:str]",
+		"lastmodified": "2023-11-06T20:10:08Z",
+		"mac": "ENC[AES256_GCM,data:s0lLBTKko7PKpjyod+kRXXqIONSnPWV8E9BInDnbY79Pf/1qfcBvSkzEKVqFgZAHYjdIcwJ774kswF5znzhaeV5mjRCKEL71P5QSVXW/7woYaU3wkD1sY3nJ2Tndjy8dxv/2GDOU1cUBRZ8Ymc+jjbsvATzf70hqqlyiYRk5LFw=,iv:ze4EbVbgpEgULeb8+mN8zWYtsqulbUoi95uEALCgigo=,tag:Z4neh43QIwek0hPGlQtIRQ==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.7.3"

ops/testnet/prod/core/config.tf

@@ -99,7 +99,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build"]
       }
       # "2053862260" = {
       #   providers = ["https://zksync-era-testnet.blockpi.network/v1/rpc/public", "https://testnet.era.zksync.dev"]
@@ -255,7 +255,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build"]
       }
     }
     cartographerUrl = "https://postgrest.testnet.connext.ninja"
@@ -286,7 +286,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}"]
       }
       "1668247156" = {
-        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build"]
       }
       "2053862260" = {
         providers = ["https://zksync-era-testnet.blockpi.network/v1/rpc/public", "https://testnet.era.zksync.dev"]
@@ -365,7 +365,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "https://rpc.goerli.linea.build"]
       }
       # "2053862260" = {
       #  providers = ["https://zksync-era-testnet.blockpi.network/v1/rpc/public", "https://testnet.era.zksync.dev"]

ops/testnet/prod/core/variables.tf

@@ -192,8 +192,4 @@ variable "relayer_web3_signer_private_key" {
 variable "admin_token_relayer" {
   type    = string
   default = "blahblah"
-}
-
-variable "linea_node" {
-  type = string
-}
+}