Prod Sync

.github/CODEOWNERS

@@ -0,0 +1,11 @@
+# global owner
+@rhlsthrm
+/ops/ @carlomazzaferro @preethamr @rhlsthrm
+/docker/ @carlomazzaferro @preethamr @rhlsthrm
+/packages/adapters/ @preethamr @liu-zhipeng @wanglonghong @sanchaymittal @rhlsthrm
+/packages/agents/ @preethamr @liu-zhipeng @wanglonghong @sanchaymittal @rhlsthrm
+/packages/agents/sdk/ @just-a-node @sanchaymittal @rhlsthrm
+/packages/deployments/ @LayneHaber @rhlsthrm @liu-zhipeng
+/packages/examples/ @just-a-node @rhlsthrm @sanchaymittal
+/packages/integration/ @LayneHaber @preethamr @rhlsthrm
+/packages/utils/ @preethamr @liu-zhipeng @wanglonghong @rhlsthrm

.github/workflows/build-test-deploy.yml

@@ -47,6 +47,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
@@ -59,6 +61,10 @@ jobs:
           node-version: "18"
           cache: "yarn"
 
+      - name: Validate using commitlint
+        if: github.ref != 'refs/heads/testnet-prod' || github.ref != 'refs/heads/prod'
+        uses: wagoid/commitlint-github-action@v5
+
       - name: Yarn install
         run: yarn install
 
@@ -90,14 +96,6 @@ jobs:
         env:
           YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          VERSION=$(cat packages/agents/sdk/package.json | jq -r '.version')
-
-          if [[ "$VERSION" == *"-alpha"* ]]; then
-            tag="alpha"
-          elif [[ "$VERSION" == *"-beta"* ]]; then
-            tag="beta"
-          fi
-
           workspaces=(
             "packages/utils:@connext/nxtp-utils"
             "packages/deployments/contracts:@connext/smart-contracts"
@@ -113,6 +111,13 @@ jobs:
             workspace="${split_entry[1]}"
             subpackage_version=$(cat $directory/package.json | jq -r '.version')
 
+            tag=""
+            if [[ "$subpackage_version" == *"-alpha"* ]]; then
+              tag="alpha"
+            elif [[ "$subpackage_version" == *"-beta"* ]]; then
+              tag="beta"
+            fi
+
             echo "Checking $workspace for existing version..."
             npm_package_info=$(npm view $workspace versions --json)
 
@@ -143,14 +148,6 @@ jobs:
         env:
           YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          VERSION=$(cat packages/deployments/contracts/package.json | jq -r '.version')
-
-          if [[ "$VERSION" == *"-alpha"* ]]; then
-            tag="alpha"
-          elif [[ "$VERSION" == *"-beta"* ]]; then
-            tag="beta"
-          fi
-
           workspaces=(
             "packages/utils:@connext/nxtp-utils"
             "packages/deployments/contracts:@connext/smart-contracts"
@@ -162,6 +159,13 @@ jobs:
             workspace="${split_entry[1]}"
             subpackage_version=$(cat $directory/package.json | jq -r '.version')
 
+            tag=""
+            if [[ "$subpackage_version" == *"-alpha"* ]]; then
+              tag="alpha"
+            elif [[ "$subpackage_version" == *"-beta"* ]]; then
+              tag="beta"
+            fi
+
             echo "Checking $workspace for existing version..."
             npm_package_info=$(npm view $workspace versions --json)
 
@@ -192,14 +196,6 @@ jobs:
         env:
           YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          VERSION=$(cat packages/agents/chain-abstraction/package.json | jq -r '.version')
-
-          if [[ "$VERSION" == *"-alpha"* ]]; then
-            tag="alpha"
-          elif [[ "$VERSION" == *"-beta"* ]]; then
-            tag="beta"
-          fi
-
           workspaces=(
             "packages/utils:@connext/nxtp-utils"
             "packages/agents/chain-abstraction:@connext/chain-abstraction"
@@ -211,6 +207,13 @@ jobs:
             workspace="${split_entry[1]}"
             subpackage_version=$(cat $directory/package.json | jq -r '.version')
 
+            tag=""
+            if [[ "$subpackage_version" == *"-alpha"* ]]; then
+              tag="alpha"
+            elif [[ "$subpackage_version" == *"-beta"* ]]; then
+              tag="beta"
+            fi
+
             echo "Checking $workspace for existing version..."
             npm_package_info=$(npm view $workspace versions --json)
 
@@ -236,45 +239,6 @@ jobs:
             fi
           done
 
-      - name: Extract version, determine tag, and publish chain-abstraction
-        if: ${{ startsWith(github.ref, 'refs/tags/chain-abstraction-v') }}
-        env:
-          YARN_NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          VERSION=$(cat packages/agents/chain-abstraction/package.json | jq -r '.version')
-
-          if [[ "$VERSION" == *"-alpha"* ]]; then
-            tag="alpha"
-          elif [[ "$VERSION" == *"-beta"* ]]; then
-            tag="beta"
-          fi
-
-          workspaces=(
-            "packages/utils:@connext/nxtp-utils"
-            "packages/agents/chain-abstraction:@connext/chain-abstraction"
-          )
-
-          for entry in "${workspaces[@]}"; do
-            IFS=":"; read -ra split_entry <<< "$entry"
-            directory="${split_entry[0]}"
-            workspace="${split_entry[1]}"
-            subpackage_version=$(cat $directory/package.json | jq -r '.version')
-
-            echo "Checking $workspace for existing version..."
-            published_version=$(npm view $workspace version)
-
-            if [[ "$published_version" != "$subpackage_version" ]]; then
-              echo "Publishing $workspace with version $subpackage_version"
-              if [[ "$tag" ]]; then
-                yarn workspace $workspace npm publish --access public --tag $tag
-              else
-                yarn workspace $workspace npm publish --access public
-              fi
-            else
-              echo "Skipping $workspace as version $subpackage_version already exists"
-            fi
-          done
-
   build-and-push-router-publisher-image:
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/testnet-prod' || github.ref == 'refs/heads/prod'
     env:

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ${1}~

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                  |
 | -------------------------------- | -------------------------------------- |
@@ -112,7 +112,7 @@ And Make sure you are on the latest yarn version:
 
 - `yarn set version berry`
 
-To set up the containers, use Docker. *If Docker is not already installed on your system, you can easily install it by clicking [here](https://www.docker.com).*
+To set up the containers, use Docker. _If Docker is not already installed on your system, you can easily install it by clicking [here](https://www.docker.com)._
 
 Try running `yarn` to update everything. If you have issues, try deleting `node_modules` and `yarn.lock`. After deleting `yarn.lock` run `touch yarn.lock` since it does not like if there is no lock file.
 

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

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

@@ -9,7 +9,8 @@
 	"arbitrum_alchemy_key_1": "ENC[AES256_GCM,data:L9MXmlyhMVx6aGacUF2VXZPU8GV/FTCRCf+nzuuZC9M=,iv:39S2/ePihP4zHtYVlXeuT4Hb6YcoLeKcsNy1t7cSI2o=,tag:evo3r9WajH6usDA/gbnE4A==,type:str]",
 	"blast_key": "ENC[AES256_GCM,data:NAUiBU8NVg5HOOUY3Cen6thsPBDN4TwrQWBnmFAsJmdfs6aY,iv:f3BnOUvaCXrIdjQAdzXhnHnTQIB2mTk3pUFpL2FufKE=,tag:7Qz0TRCXMbEZ52COnCzMkg==,type:str]",
 	"pokt_key": "ENC[AES256_GCM,data:4R/maUxD5ig+m5CkRLNKgXC7jQ1xAbbE,iv:NPf1GvSAU0v6TzFmyYViBWSO4Gk6PHtUTUnaYrDbDFc=,tag:ZMI77RvjzQPYXSPoRJwFGQ==,type:str]",
-	"admin_token_router": "ENC[AES256_GCM,data:xYsc+Nk8P9l/u4BD8GY7WDj7,iv:o7BHH1hMk6Kq7xl72f1NKDaMM44XGWqqXDM+G0Az8A4=,tag:fe4ZVKl36Ta7J5+5swwVRQ==,type:str]",
+	"admin_token_router": "ENC[AES256_GCM,data:7NUR6omfrPs2HN2zf5gDIyhOy9M=,iv:LAZ8W2um5tf8T3baD79NArSWA8T0aafHmdq1Wq+dfpk=,tag:M48iDXPPQP0sZVPPKbFqnA==,type:str]",
+	"admin_token_sequencer": "ENC[AES256_GCM,data:Y23MHgMeIr+jty7jWYy8RQNCnGs=,iv:fcLDkFEAbcuT6LYgUGxr2mtlnJz6I1Zi/BGX2thgDWU=,tag:jRZuCTDeYOxwGCZgHNljtg==,type:str]",
 	"admin_token_relayer": "ENC[AES256_GCM,data:S2DD6TdMPyirekmr,iv:zU/CCBWxbMnXNKKMqIwAM5QpNPNQi61+CAqXSsingEU=,tag:62p/pmOc1QbZQo+acyeH3g==,type:str]",
 	"router_web3_signer_private_key": "ENC[AES256_GCM,data:qNjSBBRlQS57JeVNqb/oIn/yhtHdA30I/0aMsjF34Wb+HNBSdVUvkQjybcAxIL5XXG/o74/4KmpJzyxwN0lxPoIi,iv:LcqECESi7HtEwDuQ6iJwGxa4q6rN3uy7MteIqRq/CtM=,tag:aKhIDEkA7+dvT3vx8zjqaQ==,type:str]",
 	"sequencer_web3_signer_private_key": "ENC[AES256_GCM,data:mxkVjwHNGtJ8TkiRyapfbNsEFT0zEheB++yZZy7SHqd3gFIz22DUTQ9nNOxoKhf+rsfwWt0MHsNTWyPhPmFnfPE9,iv:XDd5iMvcHmBRCXNH6vN8p/qF7MxjaWHbLzg+OaZQuQM=,tag:kemDbdZQopa06KHRTRruyw==,type:str]",
@@ -41,8 +42,8 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2023-04-21T14:45:52Z",
-		"mac": "ENC[AES256_GCM,data:C5WqmOJsD/SPfi2MLJUDSpL+L9jy8zkPpq2xDBRh1Vp4YW01hAgZRZ9QVtl7pzL1Jpa8Q0y2CHbc4dKG8nVTl7alvC6BHXa1v7fqzHfo9PVn1ICtVnTD864nJlBoQ58oYoZz93Vx54SnSLBDDQUNVfOwjPPMhAbygbG8ofZ0/mo=,iv:l/MLFecfPt3UeKe8cHnEAd4pftXdkoAFmCPnh4OwR4k=,tag:wo776bOIJS84X2r1ro0ZEA==,type:str]",
+		"lastmodified": "2023-05-23T05:55:32Z",
+		"mac": "ENC[AES256_GCM,data:K6Czhh9QffEIdLzcDyAfz6Rs3iruhWV9EuBrhCsQFmI/ao00h6slDwQeJ7Gx2lqBBO5oLf69+snl+3aF8mLZTsEXWIBzjvTDuKwGvz7I+IG0bl6A5hD0ImbOIZU5awVYzADxsGjvhVOsTIqIhAHQpcSjTBpfyrkjwgOWwBhpQ8o=,iv:niemKPXuTQWn0+CY0F0hMecpxVDECw/RMSu6gPZ3KAo=,tag:TLF/HOIlfKM/mGzvqT9nAg==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.7.3"

ops/mainnet/prod/core/config.tf

@@ -84,7 +84,7 @@ locals {
     }
 
     server = {
-      adminToken = var.admin_token_router
+      adminToken = var.admin_token_sequencer
     }
 
     logLevel = "debug"

ops/mainnet/prod/core/variables.tf

@@ -71,6 +71,11 @@ variable "admin_token_router" {
   description = "admin token"
 }
 
+variable "admin_token_sequencer" {
+  type        = string
+  description = "admin token"
+}
+
 variable "rmq_mgt_password" {
   type        = string
   description = "RabbitMQ management password"

ops/modules/db-replica/outputs.tf

@@ -25,7 +25,7 @@ output "db_instance_endpoint" {
 
 output "db_instance_name" {
   description = "The database name"
-  value       = aws_db_instance.db_read_replica.name
+  value       = aws_db_instance.db_read_replica.db_name
 }
 
 output "db_instance_username" {

ops/modules/db/outputs.tf

@@ -25,7 +25,7 @@ output "db_instance_endpoint" {
 
 output "db_instance_name" {
   description = "The database name"
-  value       = aws_db_instance.db.name
+  value       = aws_db_instance.db.db_name
 }
 
 output "db_instance_username" {

ops/testnet/prod/core/config.tf

@@ -88,7 +88,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://consensys-zkevm-goerli-prealpha.infura.io/v3/${var.infura_key}", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "${var.linea_node}"]
       }
       "2053862260" = {
         providers = ["https://testnet.era.zksync.dev"]
@@ -232,7 +232,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://consensys-zkevm-goerli-prealpha.infura.io/v3/${var.infura_key}", "${var.linea_node}"]
+        providers = ["https://linea-goerli.infura.io/v3/${var.infura_key}", "${var.linea_node}"]
       }
       "2053862260" = {
         providers = ["https://testnet.era.zksync.dev"]
@@ -262,7 +262,7 @@ locals {
         providers = ["https://arb-goerli.g.alchemy.com/v2/${var.arbgoerli_alchemy_key_0}", "https://goerli-rollup.arbitrum.io/rpc"]
       }
       "1668247156" = {
-        providers = ["https://consensys-zkevm-goerli-prealpha.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", "${var.linea_node}"]
       }
       "2053862260" = {
         providers = ["https://testnet.era.zksync.dev"]
@@ -291,8 +291,10 @@ locals {
       propagate        = "https://betteruptime.com/api/v1/heartbeat/${var.lighthouse_propagate_heartbeat}"
       sendOutboundRoot = "https://betteruptime.com/api/v1/heartbeat/${var.lighthouse_send_outbound_root_heartbeat}"
     }
-    hubDomain       = "1735353714"
-    proverBatchSize = 1
+    hubDomain = "1735353714"
+    proverBatchSize = {
+      "1668247156" = 10
+    }
   })
 
   local_relayer_config = jsonencode({

ops/testnet/prod/core/main.tf

@@ -103,8 +103,8 @@ module "router_executor" {
   health_check_path        = "/ping"
   container_port           = 8080
   loadbalancer_port        = 80
-  cpu                      = 1024
-  memory                   = 2048
+  cpu                      = 2048
+  memory                   = 4096
   instance_count           = 1
   timeout                  = 180
   ingress_cdir_blocks      = ["0.0.0.0/0"]
@@ -176,8 +176,8 @@ module "sequencer_publisher" {
   health_check_path        = "/ping"
   container_port           = 8081
   loadbalancer_port        = 80
-  cpu                      = 1024
-  memory                   = 2048
+  cpu                      = 2048
+  memory                   = 4096
   instance_count           = 1
   timeout                  = 180
   ingress_cdir_blocks      = ["0.0.0.0/0"]
@@ -206,8 +206,8 @@ module "sequencer_subscriber" {
   health_check_path        = "/ping"
   container_port           = 8082
   loadbalancer_port        = 80
-  cpu                      = 4096
-  memory                   = 8192
+  cpu                      = 8192
+  memory                   = 16384
   instance_count           = 10
   timeout                  = 180
   ingress_cdir_blocks      = ["0.0.0.0/0"]
@@ -270,7 +270,7 @@ module "lighthouse_prover_cron" {
   })
   schedule_expression = "rate(5 minutes)"
   timeout             = 900
-  memory_size         = 2048
+  memory_size         = 10240
 }
 
 module "lighthouse_process_from_root_cron" {

package.json

@@ -3,13 +3,16 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
+    "@commitlint/cli": "^17.6.3",
+    "@commitlint/config-conventional": "^17.6.3",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@jtbennett/ts-project-scripts": "1.0.0-rc.4",
     "@typescript-eslint/eslint-plugin": "5.52.0",
     "@typescript-eslint/parser": "5.52.0",
     "eslint": "8.34.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-node": "11.1.0",
+    "husky": "^8.0.3",
     "rimraf": "3.0.2"
   },
   "workspaces": [