Theta. Fefactoring after PR review

Author: EC2 Default User

lib/starknet/README.md

@@ -141,7 +141,7 @@ We will use AWS Cloud9 to execute the subsequent commands. Follow the instructio
    aws ssm start-session --target $INSTANCE_ID --region $AWS_REGION
    tail -f /var/log/starknet/error.log
    ```
-   
+
 
 7. Test Starknet RPC API
    Use curl to query from within the node instance:

lib/starknet/lib/assets/setup-instance-store-volumes.sh

@@ -15,7 +15,7 @@ if [ -n "$DATA_VOLUME_ID" ]; then
     echo "Data volume formatted. Mounting..."
     echo "waiting for volume to get UUID"
     OUTPUT=0;
-    while [ "$OUTPUT" = 0 ]; do 
+    while [ "$OUTPUT" = 0 ]; do
       DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
       OUTPUT=$(echo $DATA_VOLUME_UUID | grep -c - $2)
       echo $OUTPUT

lib/theta/README.md

@@ -6,16 +6,16 @@
 
 The Edge Node turns your computer into an edge computing node in the Theta EdgeCloud. The Edge Node can execute various types of jobs including AI/deep learning model training and inference, as well as video transcoding and relaying. By running the edge node, you can contribute unused computational and bandwidth resources and earn token rewards.
 
-This blueprint is designed to assist in deploying a single node  [Theta Edge Network Edge Node](https://docs.thetatoken.org/docs/setup-theta-edge-node) on AWS. It is intended for personal use purposes.
+This blueprint is designed to assist in deploying a single node  [Theta Edge Network Edge Node](https://docs.thetatoken.org/docs/setup-theta-edge-node) on AWS. It is intended for research and develoment use purposes.
 
 ## Overview of Deployment Architectures
 
 ### Single Node setup
 ![Single Nodes Deployment](./doc/assets/Architecture-Theta-Edge-Single-Node.drawio.png)
 
-1. The AWS Cloud Development Kit (CDK) is used to deploy a single node. The CDK application stores assets like scripts and config files in S3 bucket to copy them to the EC2 instance when launching an Edge Node.
-2. A single RPC Theta Edge Node is deployed within in the [Default VPC](https://docs.aws.amazon.com/vpc/latest/userguide/default-vpc.html) and continuously synchronizes with the rest of nodes on Theta Blockchain Network through [Internet Gateway](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Internet_Gateway.html).
-3. The Theta node is accessed by the user internally. JSON RPC API is not exposed to the Internet to protect the node from unauthorized access. User needs to SSH into the EC2 Instance using Session Manager to interact with the RPC API .
+1. A single RPC Theta Edge Node is deployed within in the [Default VPC](https://docs.aws.amazon.com/vpc/latest/userguide/default-vpc.html) and continuously synchronizes with the rest of nodes on Theta Blockchain Network through [Internet Gateway](https://docs.aws.amazon.com/vpc/latest/userguide/VPC_Internet_Gateway.html). The Theta node is accessed by the user internally. JSON RPC API is not exposed to the Internet to protect the node from unauthorized access. User can get console acess to EC2 Instance using Session Manager to interact with the RPC API from CLI.
+2. The AWS Cloud Development Kit (CDK) is used to deploy a single node. The CDK application stores assets like scripts and config files in S3 bucket to copy them to the EC2 instance when launching an Edge Node.
+3. The Theta node pulls password from Secrets Manager during startup only.
 4. The Theta node sends various monitoring metrics for both the EC2 Instance and Edge Node to Amazon CloudWatch.
 
 
@@ -34,7 +34,7 @@ This is the Well-Architected checklist for Edge nodes implementation of the AWS
 |                         |                                   | Enable people to perform actions at a distance                                   | This solution uses [AWS Systems Manager for terminal session](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-sessions-start.html#start-sys-console), not ssh ports. |
 |                         | Data protection at rest           | Use encrypted Amazon Elastic Block Store (Amazon EBS) volumes                    | This solution uses encrypted Amazon EBS volumes. |
 |                         | Authorization and access control  | Use instance profile with Amazon Elastic Compute Cloud (Amazon EC2) instances    | This solution uses AWS Identity and Access Management (AWS IAM) role instead of IAM user. |
-|                         |                                   | Following principle of least privilege access                                    | In all node types, root user is not used (using special user "edgeuser" instead). |
+|                         |                                   | Following principle of least privilege access                                    | In all node types, root user is not used (using special user "bcuser" instead). |
 |                         | Application security              | Security focused development practices                                           | cdk-nag is being used with appropriate suppressions. |
 | Cost optimization       | Service selection                 | Use cost effective resources                                                     | Although we can run the Edge Node without a GPU, we choose to use a `g4dn.xlarge` w/ a T4 GPU & 256gb GP3 EBS Storage to take advantage of the jobs the Theta Edge Network has to offer|
 |                         | Cost awareness                    | Estimate costs                                                                   | Single RPC node with `g4dn.xlarge` EBS gp3 volumes about 256 GB(10000 IOPS, 125 MBps/s throughput) with On-Demand pricing will cost around US$296.81 per month in the US East (N. Virginia) region. More cost-optimal option with 3 year EC2 Instance Savings plan the cost goes down to $159.80 USD. To create your own estimate use [AWS Pricing Calculator](https://calculator.aws/#/)                                                                                          |
@@ -43,7 +43,7 @@ This is the Well-Architected checklist for Edge nodes implementation of the AWS
 |                         | Resource monitoring               | How are workload resources monitored?                                            | Resources are being monitored using Amazon CloudWatch dashboards. Amazon CloudWatch custom metrics are being pushed via CloudWatch Agent.  |
 | Performance efficiency  | Compute selection                 | How is compute solution selected?                                                | Compute solution is selected based on best price-performance, i.e. AWS lower end GPU Amazon EC2 instances. |
 |                         | Storage selection                 | How is storage solution selected?                                                | Storage solution is selected based on best price-performance, i.e. gp3 Amazon EBS volumes with optimal IOPS and throughput. |
-|                         | Architecture selection            | How is the best performance architecture selected?                               | We used a combination of recommendations from the Theta community and our own testing. |
+|                         | Architecture selection            | How is the best performance architecture selected?                               | We used a combination of recommendations from the Theta community. |
 | Operational excellence  | Workload health                   | How is health of workload determined?                                            | Health of the workload is based on EC2 status checks. |
 | Sustainability          | Hardware & services               | Select most efficient hardware for your workload                                 | The solution uses T4-powered instances. This is a lower end, data-center GPU that will be sufficient for getting the average user up and running on the Theta Edge Network. |
 </details>
@@ -114,7 +114,7 @@ npm install
 
    # Set a password for your theta edge node wallet client
    EDGE_NODE_PASSWORD=letscompute # please change 'letscompute' to something more secure
-   npx cdk deploy edge-common --parameters edgeNodePassword=$EDGE_NODE_PASSWORD
+   npx cdk deploy theta-edge-common --parameters edgeNodePassword=$EDGE_NODE_PASSWORD
    ```
 
 
@@ -124,7 +124,7 @@ npm install
    ```bash
       pwd
       # Make sure you are in aws-blockchain-node-runners/lib/theta
-      npx cdk deploy edge-single-node --json --outputs-file single-node-deploy.json
+      npx cdk deploy theta-edge-single-node --json --outputs-file single-node-deploy.json
    ```
 
 2. After the node is initialised you need to wait another 10 minutes for the inital edge node startup process to complete. You can use Amazon CloudWatch to track the progress. There is a script that publishes CloudWatch metrics every minute, where you can watch `theta_current_block_height`. When the node is fully launched you should see the `Theta Client Block Height` & `Theta Client Peer Count` dashboards populate. To see them:
@@ -172,11 +172,11 @@ pwd
 # Make sure you are in aws-blockchain-node-runners/lib/theta
 
 # Destroy Single Node
-npx cdk destroy edge-single-node
+npx cdk destroy theta-edge-single-node
 
 
  # Delete all common components like IAM role and Security Group
-npx cdk destroy edge-common
+npx cdk destroy theta-edge-common
 ```
 2. Follow steps to delete the Cloud9 instance in [Cloud9 Setup](../../doc/setup-cloud9.md)
 

lib/theta/app.ts

@@ -10,13 +10,13 @@ import * as nag from "cdk-nag";
 const app = new cdk.App();
 cdk.Tags.of(app).add("Project", "AWS_THETA_EDGE");
 
-new EdgeCommonStack(app, "edge-common", {
-    stackName: `edge-nodes-common`,
+new EdgeCommonStack(app, "theta-edge-common", {
+    stackName: `theta-edge-nodes-common`,
     env: { account: config.baseConfig.accountId, region: config.baseConfig.region }
 });
 
-new EdgeSingleNodeStack(app, "edge-single-node", {
-    stackName: `edge-single-node-${config.baseNodeConfig.edgeNetwork}`,
+new EdgeSingleNodeStack(app, "theta-edge-single-node", {
+    stackName: `theta-edge-single-node-${config.baseNodeConfig.edgeNetwork}`,
 
     env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
     nodeRole: <configTypes.EdgeNodeRole> "single-node",
@@ -29,7 +29,6 @@ new EdgeSingleNodeStack(app, "edge-single-node", {
 });
 
 
-
 // Security Check
 cdk.Aspects.of(app).add(
     new nag.AwsSolutionsChecks({

lib/theta/lib/assets/setup-instance-store-volumes.sh

@@ -4,35 +4,39 @@ source /etc/environment
 
 if [[ "$DATA_VOLUME_TYPE" == "instance-store" ]]; then
   echo "Data volume type is instance store"
-  export DATA_VOLUME_ID=/dev/$(lsblk -lnb | awk -v VOLUME_SIZE_BYTES="$DATA_VOLUME_SIZE" '{if ($4== VOLUME_SIZE_BYTES) {print $1}}')
+  export DATA_VOLUME_ID=/dev/$(lsblk -lnb | awk 'max < $4 {max = $4; vol = $1} END {print vol}')
 fi
 
 if [ -n "$DATA_VOLUME_ID" ]; then
   if [ $(df --output=target | grep -c "/data") -lt 1 ]; then
     echo "Checking fstab for Data volume"
 
-    sudo mkfs.xfs -f $DATA_VOLUME_ID
-    sleep 10
+    mkfs.ext4 $DATA_VOLUME_ID
+    echo "Data volume formatted. Mounting..."
+    echo "waiting for volume to get UUID"
+    OUTPUT=0;
+    while [ "$OUTPUT" = 0 ]; do
+      DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
+      OUTPUT=$(echo $DATA_VOLUME_UUID | grep -c - $2)
+      echo $OUTPUT
+    done
     DATA_VOLUME_UUID=$(lsblk -fn -o UUID  $DATA_VOLUME_ID)
-    DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data xfs defaults 0 2"
+    DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data ext4 defaults 0 2"
     echo "DATA_VOLUME_ID="$DATA_VOLUME_ID
     echo "DATA_VOLUME_UUID="$DATA_VOLUME_UUID
     echo "DATA_VOLUME_FSTAB_CONF="$DATA_VOLUME_FSTAB_CONF
 
     # Check if data disc is already in fstab and replace the line if it is with the new disc UUID
     if [ $(grep -c "data" /etc/fstab) -gt 0 ]; then
       SED_REPLACEMENT_STRING="$(grep -n "/data" /etc/fstab | cut -d: -f1)s#.*#$DATA_VOLUME_FSTAB_CONF#"
-      sudo cp /etc/fstab /etc/fstab.bak
-      sudo sed -i "$SED_REPLACEMENT_STRING" /etc/fstab
+      cp /etc/fstab /etc/fstab.bak
+      sed -i "$SED_REPLACEMENT_STRING" /etc/fstab
     else
       echo $DATA_VOLUME_FSTAB_CONF | sudo tee -a /etc/fstab
     fi
 
     sudo mount -a
 
-    /opt/download-snapshot.sh
-
-    chown bcuser:bcuser -R /data
   else
     echo "Data volume is mounted, nothing changed"
   fi

lib/theta/lib/assets/theta_metrics/metricscollector.sh renamed to lib/theta/lib/assets/sync-checker/syncchecker-theta.sh

@@ -12,6 +12,7 @@ echo "EDGE_NETWORK=${_EDGE_NETWORK_}" >> /etc/environment
 echo "EDGE_LAUNCHER_VERSION=${_EDGE_LAUNCHER_VERSION_}" >> /etc/environment
 echo "EDGE_NODE_GPU=${_EDGE_NODE_GPU_}" >> /etc/environment
 echo "NODE_ROLE=${_NODE_ROLE_}" >> /etc/environment
+EDGE_NODE_PASSWORD_SSM_ARN=${_EDGE_NODE_PASSWORD_SSM_ARN_}
 
 source /etc/environment
 
@@ -35,7 +36,6 @@ amazon-linux-extras install epel -y
 yum groupinstall "Development Tools" -y
 yum -y install amazon-cloudwatch-agent collectd jq gcc10-10.5.0-1.amzn2.0.2 ncurses-devel telnet aws-cfn-bootstrap
 
-
 cd /opt
 
 echo 'Installing AWS CLI v2'
@@ -63,14 +63,6 @@ aws configure set default.s3.multipart_chunksize 256MB
 echo 'Installing SSM Agent'
 yum install -y $SSM_AGENT_BINARY_URI
 
-echo "Installing s5cmd"
-cd /opt
-wget -q $S5CMD_URI -O s5cmd.tar.gz
-tar -xf s5cmd.tar.gz
-chmod +x s5cmd
-mv s5cmd /usr/bin
-s5cmd version
-
 if [ "$EDGE_NODE_GPU" == "enabled"  ]; then
   echo "Installing nvidia drivers"
   yum install kernel-devel-$(uname -r) kernel-headers-$(uname -r) -y
@@ -99,34 +91,24 @@ if [ "$EDGE_NODE_GPU" == "enabled"  ]; then
   sudo mv /usr/bin/cc.bak /usr/bin/cc
 fi
 
-
-
 echo "Installing docker"
 yum install docker -y
 sudo service docker start
 sudo systemctl enable docker
 
+echo 'Adding bcuser user and group'
+sudo groupadd -g 1002 bcuser
+sudo useradd -u 1002 -g 1002 -m -s /bin/bash bcuser
+sudo usermod -aG docker bcuser
 
-
-
-
-echo 'Adding edgeuser user and group'
-sudo groupadd -g 1002 edgeuser
-sudo useradd -u 1002 -g 1002 -m -s /bin/bash edgeuser
-sudo usermod -aG sudo edgeuser
-sudo usermod -aG docker edgeuser
-
-echo "Configuring metricscollector script"
+echo "Configuring syncchecker script"
 cd /opt
-mv /opt/theta_metrics/metricscollector.sh /opt/metricscollector.sh
-chmod +x /opt/metricscollector.sh
+mv /opt/sync-checker/syncchecker-theta.sh /opt/syncchecker.sh
+chmod +x /opt/syncchecker.sh
 
-
-(crontab -l; echo "*/1 * * * * /opt/metricscollector.sh >/tmp/metricscollector.log 2>&1") | crontab -
+(crontab -l; echo "*/1 * * * * /opt/syncchecker.sh >/tmp/syncchecker.log 2>&1") | crontab -
 crontab -l
 
-
-
 if [ "$NODE_ROLE" == "single-node"  ]; then
   echo "Single node. Signaling completion to CloudFormation"
   /opt/aws/bin/cfn-signal --stack $STACK_NAME --resource $RESOURCE_ID --region $AWS_REGION
@@ -148,39 +130,47 @@ if [[ "$DATA_VOLUME_TYPE" == "instance-store" ]]; then
   (crontab -l; echo "@reboot /opt/setup-instance-store-volumes.sh >/tmp/setup-instance-store-volumes.log 2>&1") | crontab -
   crontab -l
 
-  /opt/setup-instance-store-volumes.sh
+  DATA_VOLUME_ID=/dev/$(lsblk -lnb | awk 'max < $4 {max = $4; vol = $1} END {print vol}')
 
 else
   echo "Data volume type is EBS"
 
   DATA_VOLUME_ID=/dev/$(lsblk -lnb | awk -v VOLUME_SIZE_BYTES="$DATA_VOLUME_SIZE" '{if ($4== VOLUME_SIZE_BYTES) {print $1}}')
-  mkfs -t xfs $DATA_VOLUME_ID
-  sleep 10
-  DATA_VOLUME_UUID=$(lsblk -fn -o UUID  $DATA_VOLUME_ID)
-  DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data xfs defaults 0 2"
-  echo "DATA_VOLUME_ID="$DATA_VOLUME_ID
-  echo "DATA_VOLUME_UUID="$DATA_VOLUME_UUID
-  echo "DATA_VOLUME_FSTAB_CONF="$DATA_VOLUME_FSTAB_CONF
-  echo $DATA_VOLUME_FSTAB_CONF | tee -a /etc/fstab
-  mount -a
 fi
 
+mkfs -t ext4 $DATA_VOLUME_ID
+echo "waiting for volume to get UUID"
+  OUTPUT=0;
+  while [ "$OUTPUT" = 0 ]; do
+    DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
+    OUTPUT=$(echo $DATA_VOLUME_UUID | grep -c - $2)
+    echo $OUTPUT
+  done
+DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
+DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data ext4 defaults 0 2"
+echo "DATA_VOLUME_ID="$DATA_VOLUME_ID
+echo "DATA_VOLUME_UUID="$DATA_VOLUME_UUID
+echo "DATA_VOLUME_FSTAB_CONF="$DATA_VOLUME_FSTAB_CONF
+echo $DATA_VOLUME_FSTAB_CONF | tee -a /etc/fstab
+mount -a
+
 lsblk -d
 
-chown edgeuser:edgeuser -R /data
+chown bcuser:bcuser -R /data
 
 docker pull thetalabsorg/edgelauncher_mainnet:latest
 
+sudo su bcuser
 
-export EDGE_NODE_PASSWORD=`aws secretsmanager get-secret-value --secret-id edgeNodePassword --query SecretString --output text`
+EDGE_NODE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id $EDGE_NODE_PASSWORD_SSM_ARN --query SecretString --output text --region $AWS_REGION)
 
 if [[ "$EDGE_NODE_GPU" == "enabled" ]]; then
-  docker run -d --gpus all -e EDGELAUNCHER_CONFIG_PATH=/edgelauncher/data/$EDGE_NETWORK -e PASSWORD=$EDGE_NODE_PASSWORD -v /data/edgelauncher:/edgelauncher/data/$EDGE_NETWORK -p 127.0.0.1:15888:15888 -p 127.0.0.1:17888:17888 -p 127.0.0.1:17935:17935 --name edgelauncher --restart unless-stopped -it thetalabsorg/edgelauncher_$EDGE_NETWORK:$EDGE_LAUNCHER_VERSION
+  docker run -d --gpus all --user $(id -u):$(id -g) -e EDGELAUNCHER_CONFIG_PATH=/edgelauncher/data/$EDGE_NETWORK -e PASSWORD=$EDGE_NODE_PASSWORD -v /data/edgelauncher:/edgelauncher/data/$EDGE_NETWORK -p 127.0.0.1:15888:15888 -p 127.0.0.1:17888:17888 -p 127.0.0.1:17935:17935 --name edgelauncher --restart unless-stopped -it thetalabsorg/edgelauncher_$EDGE_NETWORK:$EDGE_LAUNCHER_VERSION
 
 else
-    docker run -d -e EDGELAUNCHER_CONFIG_PATH=/edgelauncher/data/$EDGE_NETWORK -e PASSWORD=$EDGE_NODE_PASSWORD -v /data/edgelauncher:/edgelauncher/data/$EDGE_NETWORK -p 127.0.0.1:15888:15888 -p 127.0.0.1:17888:17888 -p 127.0.0.1:17935:17935 --name edgelauncher --restart unless-stopped -it thetalabsorg/edgelauncher_$EDGE_NETWORK:$EDGE_LAUNCHER_VERSION
+  docker run -d --user $(id -u):$(id -g) -e EDGELAUNCHER_CONFIG_PATH=/edgelauncher/data/$EDGE_NETWORK -e PASSWORD=$EDGE_NODE_PASSWORD -v /data/edgelauncher:/edgelauncher/data/$EDGE_NETWORK -p 127.0.0.1:15888:15888 -p 127.0.0.1:17888:17888 -p 127.0.0.1:17935:17935 --name edgelauncher --restart unless-stopped -it thetalabsorg/edgelauncher_$EDGE_NETWORK:$EDGE_LAUNCHER_VERSION
 fi
-
+EDGE_NODE_PASSWORD=""
 
 echo "All Done!!"
 set -e

lib/theta/lib/assets/user-data/node.sh

@@ -52,6 +52,11 @@ export class EdgeCommonStack extends cdk.Stack {
 
         secretEdgeNodePassword.grantRead(instanceRole)
 
+        new cdk.CfnOutput(this, "ssm-edge-node-password-ARN", {
+            value: secretEdgeNodePassword.secretArn,
+            exportName: "SSMEdgeNodePasswordARN",
+        });
+
 
         // cdk-nag suppressions
         nag.NagSuppressions.addResourceSuppressions(

lib/theta/lib/common-stack.ts

@@ -64,11 +64,11 @@ export class EdgeSingleNodeStack extends cdk.Stack {
 
         const instanceRole = iam.Role.fromRoleArn(this, "iam-role", importedInstanceRoleArn);
 
+        const sSMEdgeNodePasswordARN = cdk.Fn.importValue("SSMEdgeNodePasswordARN");
+
         // Making sure our instance will be able to read the assets
         asset.bucket.grantRead(instanceRole);
 
-
-
         // Setting up the node using generic Single Node constract
         const node = new SingleNodeConstruct(this, "single-node", {
             instanceName: STACK_NAME,
@@ -106,7 +106,7 @@ export class EdgeSingleNodeStack extends cdk.Stack {
             _EDGE_NETWORK_: edgeNetwork,
             _EDGE_NODE_GPU_: edgeNodeGpu,
             _EDGE_LAUNCHER_VERSION_: edgeLauncherVersion,
-            _EDGE_NODE_PASSWORD_: cdk.SecretValue.secretsManager("edgeNodePassword").unsafeUnwrap().toString()
+            _EDGE_NODE_PASSWORD_SSM_ARN_: sSMEdgeNodePasswordARN
         });
 
         // Adding modified userdata script to the instance prepared fro us by Single Node constract

lib/theta/lib/single-node-stack.ts

@@ -1,24 +1,12 @@
 {
-  "name": "aws-blockchain-node-runners-bsc",
+  "name": "aws-blockchain-node-runners-theta",
   "version": "0.1.0",
-  "bin": {
-    "scroll": "bin/bsc.js"
-  },
   "scripts": {
     "build": "tsc",
     "watch": "tsc -w",
     "test": "jest",
     "cdk": "cdk",
     "cdk_deploy_common": "cdk deploy edge-common",
-    "cdk_deploy_ha_nodes": "cdk deploy edge-single-node",
-    "cdk_destroy_common": "cdk destroy edge-common",
-    "cdk_destroy_ha_nodes": "cdk destroy edge-single-nodes"
-  },
-  "dependencies": {
-    "@types/node": "^20.10.0",
-    "dotenv": "^16.3.1"
-  },
-  "devDependencies": {
-    "@types/jest": "^29.5.12"
+    "cdk_destroy_common": "cdk destroy edge-common"
   }
 }