Merge pull request #6179 from connext/testnet-prod-main-sync

Testnet prod main sync
connext · May 15, 2024 · d2e9c3c · d2e9c3c
2 parents f3061d9 + f0e748d
commit d2e9c3c
Show file tree

Hide file tree

Showing 167 changed files with 493,365 additions and 466,924 deletions.
diff --git a/.github/ISSUE_TEMPLATE/analytics-request.md b/.github/ISSUE_TEMPLATE/analytics-request.md
@@ -3,7 +3,7 @@ name: Analytics request
 about: adhoc analysis, dashboards, data infra etc
 title: ''
 labels: "analytics \U0001F4CF, xERC20 \U0001FA99"
-assignees: par94
+assignees: ''
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/bug---support.md b/.github/ISSUE_TEMPLATE/bug---support.md
@@ -10,6 +10,9 @@ assignees: ''
 **Describe the bug**
 A clear and concise description of what the bug is.
 
+**Where did the user initiate this transfer?**
+Connext UI, Jumper, Metamask, dApp, etc
+
 **Link to ticket in discord**
 
 **To Reproduce**

diff --git a/5432 b/5432
diff --git a/ops/env/mainnet/backend/secrets.prod.json b/ops/env/mainnet/backend/secrets.prod.json
@@ -6,6 +6,7 @@
 	"carto_roots_heartbeat": "ENC[AES256_GCM,data:aQUjIO2i5CfDxI/1wDVDwkDv7ltpv8R6,iv:YQ1IRa8Q+gKwbCmZe/WcvGIedkMHO7ZpdI5BCd6eM9M=,tag:SBWMD6zaWhS8ZUIFzDX+dA==,type:str]",
 	"carto_routers_heartbeat": "ENC[AES256_GCM,data:nNsVs2rwfCvyeb2w4Oe3qei1sHBMZFEF,iv:vgJy5ibp5mItU2ed9oTD7y3V/9kR1s7lI0y8yxgFwKY=,tag:6fEuqTrl64gYlL4sPFPNgQ==,type:str]",
 	"blast_key": "ENC[AES256_GCM,data:WK8loJvsgQgcXJtkgTRXX3E1PUQ7xL6rKmhEqMiuJGZGSkHF,iv:6+0/wAQBsevYRox2Gklj3kRuFMiuShRApBE4m/WVRDc=,tag:Pv+Ck8suF4yspUy3vtxVdg==,type:str]",
+	"xlayer_key": "ENC[AES256_GCM,data:r8PZMyGkCRLp,iv:3qilCz4OoIx3UVnhpNEd7hFnnHEpxYEi8EBjTzlsK5Q=,tag:HvZ8/f3V6DFPR/xrJxuDbw==,type:str]",
 	"carto_transfers_heartbeat": "ENC[AES256_GCM,data:uO12tqnIJicj6w/xKJe6+W0e+ZhSOdMR,iv:82jNsVweODRvpcx76P1Rzy40miQ31xLTtAWtpn1FXlM=,tag:BYccAfJKHrjHNGvhaLnK6g==,type:str]",
 	"sops": {
 		"kms": [
@@ -20,8 +21,8 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2024-02-08T23:32:51Z",
-		"mac": "ENC[AES256_GCM,data:UF01CGsZd8s0Sit3q0FyEldM17+xJ2srfa9a8JBhA5UlUX1q7v5u88Vif6Q9nXqIpje+AMoVOp29kJrIFRioKh0ESCTXukIULSi4t1fxdL9X3a1T4a8/QEgofgKfj4Gcu64z5aNKVGjU2evjlXoNrpJOllqxZg6TYVlkkHgXAGU=,iv:sD+wXJt8GCOV4mRrHMnsDHWUiY9R8sgLhJvAGjgWzcs=,tag:Oqe7M6j+XKtziFEdREJbbw==,type:str]",
+		"lastmodified": "2024-05-15T22:20:56Z",
+		"mac": "ENC[AES256_GCM,data:upt7irDGJ6BvXlDFsrKf5eAab0oqVmAWB5L9DKULFfzFBP2Qz8wORRLnRxZrBSeVqU1o4Emm++TEnQwR8S90pxOA89Iuk7hSTssMRQdn+6sjKlriYIAK4xXTQdz38Xmw+0MMDt5SC+QXLf0KCrENoXTEzxNS3LP/U75wpCF9q68=,iv:Vt1JGErgaCkL9EvCsl9/T0WxXNUkpoTRAYVENDu1Xu8=,tag:g3sYYjnnH0zt9ksZQ4p5aA==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.7.3"

diff --git a/ops/env/mainnet/core/secrets.prod.json b/ops/env/mainnet/core/secrets.prod.json
@@ -8,6 +8,7 @@
 	"arbitrum_alchemy_key_0": "ENC[AES256_GCM,data:s7DiEl80b40CMBFtGF5B4KteWVgLTfiQ81wINr4A/3I=,iv:AR+yuruEw2LdcSn1yWSYRS4l3IViHPhMckR4Lo4vrwU=,tag:KgJyUdg11CBbkEzzvibYlQ==,type:str]",
 	"arbitrum_alchemy_key_1": "ENC[AES256_GCM,data:YpkTB3bE8H+SRj0NJsSbAZG6bquC8tBppgFrFTdigeY=,iv:MAI4/kQRMpKIVZvIAuU6CjCPDQXpSEsH4jiRsX9942o=,tag:snuC64N+nD9WVNaJKf3yiQ==,type:str]",
 	"blast_key": "ENC[AES256_GCM,data:wrBspEOVJURCx2yVnwhbHI/y3j0tEjS3fJHjyt0SV0pXgSaa,iv:ujiquRGXLcJAob+n1nnS7PZ8aD3kiImSe0bMIZfonCI=,tag:2XaWmCnsrcntBv7/Xf1WpQ==,type:str]",
+	"xlayer_key": "ENC[AES256_GCM,data:kkCMGxQ/w/OR,iv:P1G/v/FAmNQrTACJLVV3pHe3iods1hY0MJzLUWx5DSw=,tag:VPgIXxtfTWwgxDno7+cpvg==,type:str]",
 	"pokt_key": "ENC[AES256_GCM,data:ZMWLD7gKQeo+NPr9rzPNxuV+VRhfrwIQ,iv:oZHdi2+roMe0vVfuJEjBWvEFdZdxYvJfU/HzwQp2Fk0=,tag:tZRUMISbvE/ZH+79vOkvug==,type:str]",
 	"admin_token_router": "ENC[AES256_GCM,data:kX/AG6A7V3ENXsbuBfGCdJmx3v4=,iv:sVDSZrzrUPlrGLSb82aoyePA71LvwETtbpHR/h/Wseo=,tag:+LoZwqNV26Kxj62XmJj7eQ==,type:str]",
 	"admin_token_sequencer": "ENC[AES256_GCM,data:HQ238buDVCqD8UdOCQR3segDwuE=,iv:JHFLNNz09vUCxCbwzPDW7sDQB+v8knqaIt75+anhO5Q=,tag:MIF02j/Rm1044M2dDAs+lA==,type:str]",
@@ -47,8 +48,8 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2024-03-21T02:13:46Z",
-		"mac": "ENC[AES256_GCM,data:22ATjfRY1++KQkov/59z+dtxB8pkuxHK+kdUQ29JUNQmXKmN2ocK72v1klwOvS0LE4so6grDCi2pUhuF6Ph6vMzbl1FQnPnGclgWaC+qC7hNFK19tIEyg1MOI3p9iTKQ7qCAXJn6TQF3kLOWP9hCjllFGFpZV6dtrVMmIEOdgYg=,iv:K80uj9CLPWAXYjLkUSKjTfUxegwYsvq8uXa89v7XGCQ=,tag:y/zjXYSsdKduv2fIxjrPHg==,type:str]",
+		"lastmodified": "2024-05-15T22:19:45Z",
+		"mac": "ENC[AES256_GCM,data:GAhT1yAgx2RVHfCmZXRTp7FVWiEUf4dun5R2Od7sKGq9RkVy8ULE31MViJnz2RweXgMEDBltH8RNYV2ka/hBKe7jeqQAnraoi72ZA0f5S2338Ajpw2Mo4y6BRyi8aAVUrs22cJij3MdBenJyHCBWl7tQcNL8nQ4Iex1mNCXtBSY=,iv:LWzArO7R8A0hB0x3jxe7gND4Mjrg+wXvkPHSsb9CgZo=,tag:m9Mca/Gn35Dozh1BYhwwZQ==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.8.1"

diff --git a/ops/env/mainnet/core/secrets.staging.json b/ops/env/mainnet/core/secrets.staging.json
@@ -35,10 +35,10 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2024-01-23T23:33:32Z",
-		"mac": "ENC[AES256_GCM,data:Bs8kkvs6Dh4MP16yAbOafFdpHYTlNNzwOJRtW+d8dVQgK9laKuAzFgCk+d5f+ouqc+42z09GPbe899g06rBNkkPeCiE+mRMkAgb1RKU45BMXdQz2rekt/aZlMzRmUIIDKWiRyuc3Y2pyPJQNMaPfrsbNTau1uR/OTvpllG3wylg=,iv:hD0tAu7DCKxwcU1uN7uCYTzYtipB9tMi4cgfNvPIUu8=,tag:OZT0TFuqvsm/ZZJkuRvQdA==,type:str]",
+		"lastmodified": "2024-04-23T08:20:33Z",
+		"mac": "ENC[AES256_GCM,data:JhfT//c6k/TTb6NQTzf+O6k0mbIEXAiyOuChARaPcLwtZCEjFhBUiK0IzDaIDm/rqiTEM3LxuFZgFIUI+qj7Nwj0LPPVU45749DcBa+psI3z5Hc3RPzwr1THxAVhsjcSkhj4UCCNB9u0td6GW0qLeQ4thxSwLF65kXiAUTWBdyg=,iv:vpdTb8Gavqq1supKqp/rwUiO9XlSf1s4bpZ+4yM9HVQ=,tag:If1JKzC+uEyqRydFdhHXpg==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
+		"version": "3.8.1"
 	}
 }
diff --git a/ops/mainnet/prod/backend/config.tf b/ops/mainnet/prod/backend/config.tf
@@ -71,8 +71,11 @@ locals {
         providers = ["https://mantle-mainnet.blastapi.io/${var.blast_key}"]
       }
       "1836016741" = {
-        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}"]
-      }      
+        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
+      }
+      "2020368761" = {
+        providers = ["https://rpc.xlayer.tech/${var.xlayer_key}", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
+      }
     }
 
     # The following are defined in variables.tf and don't map to the
@@ -111,6 +114,7 @@ locals {
       "1835365481" = { confirmations = 1 }
       "1835101812" = { confirmations = 1 }
       "1836016741" = { confirmations = 10 }
+      "2020368761" = { confirmations = 10 }
     }
     environment = var.stage
     healthUrls = {

diff --git a/ops/mainnet/prod/backend/variables.tf b/ops/mainnet/prod/backend/variables.tf
@@ -81,3 +81,8 @@ variable "blast_key" {
   type      = string
   sensitive = true
 }
+
+variable "xlayer_key" {
+  type      = string
+  sensitive = true
+}
diff --git a/ops/mainnet/prod/core/config.tf b/ops/mainnet/prod/core/config.tf
@@ -138,7 +138,10 @@ locals {
         providers = ["https://mantle-mainnet.blastapi.io/${var.blast_key}"]
       }
       "1836016741" = {
-        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}"]
+        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
+      }
+      "2020368761" = {
+        providers = ["https://rpc.xlayer.tech/${var.xlayer_key}", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
       }
     }
     web3SignerUrl = "https://${module.sequencer_web3signer.service_endpoint}"
@@ -263,6 +266,12 @@ locals {
           limit      = 1
           queueLimit = 1000000
           subscribe  = true
+        },
+        {
+          name       = "2020368761"
+          limit      = 1
+          queueLimit = 1000000
+          subscribe  = true
         }
       ]
       bindings = [
@@ -340,6 +349,11 @@ locals {
           exchange = "sequencerX"
           target   = "1836016741"
           keys     = ["1836016741"]
+        },
+        {
+          exchange = "sequencerX"
+          target   = "2020368761"
+          keys     = ["2020368761"]
         }
       ]
       executerTimeout = 300000
@@ -410,6 +424,9 @@ locals {
       "1836016741" = {
         providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
       }
+      "2020368761" = {
+        providers = ["https://rpc.xlayer.tech/unlimited", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
+      }
     }
     cartographerUrl = "https://postgrest.mainnet.connext.ninja"
     web3SignerUrl   = "https://${module.router_web3signer.service_endpoint}"
@@ -469,6 +486,9 @@ locals {
       "1836016741" = {
         providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
       }
+      "2020368761" = {
+        providers = ["https://rpc.xlayer.tech/unlimited", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
+      }
     }
     gelatoApiKey = "${var.gelato_api_key}"
     environment  = var.stage
@@ -512,23 +532,26 @@ locals {
       "1635148152" = 10,
       "1835365481" = 10,
       "1835101812" = 10,
-      "1836016741" = 10
+      "1836016741" = 10,
+      "2020368761" = 10
     }
     proverBatchWaitTime = {
       "6648936"    = 43200,
-      "1634886255" = 7200,
-      "1869640809" = 7200,
-      "1886350457" = 7200,
-      "6450786"    = 7200,
-      "6778479"    = 7200,
-      "1818848877" = 7200,
-      # "2053862243" = 7200,
-      "1887071085" = 7200,
-      "1650553709" = 7200,
-      "1635148152" = 7200,
-      "1835365481" = 7200,
-      "1835101812" = 7200,
-      "1836016741" = 7200
+      "1634886255" = 14400,
+      "1869640809" = 14400,
+      "1886350457" = 14400,
+      "1634886255" = 14400,
+      "6450786"    = 14400,
+      "6778479"    = 14400,
+      "1818848877" = 14400,
+      "2053862243" = 14400,
+      "1887071085" = 14400,
+      "1650553709" = 14400,
+      "1635148152" = 14400,
+      "1835365481" = 14400,
+      "1835101812" = 14400,
+      "1836016741" = 14400,
+      "2020368761" = 14400
     }
     messageQueue = {
       connection = {
@@ -600,7 +623,10 @@ locals {
         providers = ["https://mantle-mainnet.blastapi.io/${var.blast_key}"]
       }
       "1836016741" = {
-        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}"]
+        providers = ["https://mode-mainnet.blastapi.io/${var.blast_key}", "https://mainnet.mode.network/"]
+      }
+      "2020368761" = {
+        providers = ["https://rpc.xlayer.tech/unlimited", "https://rpc.xlayer.tech", "https://xlayerrpc.okx.com"]
       }
     }
     environment   = var.stage

diff --git a/ops/mainnet/prod/core/variables.tf b/ops/mainnet/prod/core/variables.tf
@@ -151,6 +151,11 @@ variable "blast_key" {
   sensitive = true
 }
 
+variable "xlayer_key" {
+  type      = string
+  sensitive = true
+}
+
 variable "infura_key" {
   type      = string
   sensitive = true

diff --git a/packages/adapters/cache/package.json b/packages/adapters/cache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@connext/nxtp-adapters-cache",
-  "version": "2.5.0-alpha.1",
+  "version": "2.5.0-alpha.5",
   "description": "adapter for handling communication with Redis cache for nxtp protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",