Merge pull request #58 from aws-samples/solana

Solana

Author: frbrkoala

lib/solana/README.md

@@ -129,7 +129,6 @@ Create your own copy of `.env` file and edit it to update with your AWS Account
 ```bash
    pwd
    # Make sure you are in aws-blockchain-node-runners/lib/solana
-   npm i --save-dev @types/node
    npx cdk deploy solana-common
 ```
 

lib/solana/lib/assets/node-cw-dashboard.ts

@@ -283,6 +283,42 @@ export const SingleNodeCWDashboardJSON = {
                 "period": 60,
                 "title": "nvme1n1 Volume Read/Write throughput (bytes/sec)"
             }
+        },
+        {
+            "height": 5,
+            "width": 6,
+            "y": 15,
+            "x": 6,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [ "CWAgent", "disk_used_percent", "InstanceId", "${INSTANCE_ID}", "device", "nvme1n1", "path", "/var/solana/data", "fstype", "xfs", { "region": "${REGION}", "label": "/home/ubuntu/l2geth-source/l2geth-datadir" } ]
+                ],
+                "sparkline": true,
+                "view": "singleValue",
+                "region": "${REGION}",
+                "title": "nvme1n1 Disk Used (%)",
+                "period": 60,
+                "stat": "Average"
+            }
+        },
+        {
+            "height": 5,
+            "width": 6,
+            "y": 15,
+            "x": 12,
+            "type": "metric",
+            "properties": {
+                "metrics": [
+                    [ "CWAgent", "disk_used_percent", "InstanceId", "${INSTANCE_ID}", "device", "nvme2n1",  "path", "/var/solana/accounts", "fstype", "xfs", { "region": "${REGION}", "label": "/home/ubuntu/l2geth-source/l2geth-datadir" } ]
+                ],
+                "sparkline": true,
+                "view": "singleValue",
+                "region": "${REGION}",
+                "title": "nvme2n1 Disk Used (%)",
+                "period": 60,
+                "stat": "Average"
+            }
         }
     ]
 }

lib/solana/lib/assets/solana/node-consensus-template.sh

@@ -8,6 +8,9 @@ export RUST_LOG=error
 export RUST_BACKTRACE=full
 export SOLANA_METRICS_CONFIG=__SOLANA_METRICS_CONFIG__
 
+#See https://github.com/aws-samples/aws-blockchain-node-runners/issues/31
+ulimit -n 1000000
+
 TOKEN=$(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
 export EC2_INTERNAL_IP=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -s http://169.254.169.254/latest/meta-data/local-ipv4)
 

lib/solana/lib/assets/solana/node-heavy-rpc-template.sh

@@ -8,6 +8,9 @@ export RUST_LOG=error
 export RUST_BACKTRACE=full
 export SOLANA_METRICS_CONFIG=__SOLANA_METRICS_CONFIG__
 
+#See https://github.com/aws-samples/aws-blockchain-node-runners/issues/31
+ulimit -n 1000000
+
 TOKEN=$(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
 export EC2_INTERNAL_IP=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -s http://169.254.169.254/latest/meta-data/local-ipv4)
 

lib/solana/lib/assets/solana/node-light-rpc-template.sh

@@ -8,14 +8,12 @@ export RUST_LOG=error
 export RUST_BACKTRACE=full
 export SOLANA_METRICS_CONFIG=__SOLANA_METRICS_CONFIG__
 
+#See https://github.com/aws-samples/aws-blockchain-node-runners/issues/31
+ulimit -n 1000000
+
 TOKEN=$(curl -s -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 21600")
 export EC2_INTERNAL_IP=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -s http://169.254.169.254/latest/meta-data/local-ipv4)
 
-# TODO: Delete below
-# --gossip-port 8800 \
-# --dynamic-port-range 8801-8814 \ SG ports 8802-8814
-# --no-port-check \
-
 /home/solana/bin/solana-validator \
 --ledger /var/solana/data/ledger \
 --identity /home/solana/config/validator-keypair.json \

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

@@ -110,13 +110,13 @@ sudo bash -c "cat >/etc/security/limits.d/90-solana-nofiles.conf <<EOF
 * - nofile 1000000
 EOF"
 
-echo 'Preparing directories and file system for Solana installation'
+echo 'Preparing fs for Solana installation'
 sudo mkdir /var/solana
 sudo mkdir /var/solana/data
 sudo mkdir /var/solana/accounts
 
 if [[ "$STACK_ID" != "none" ]]; then
-  echo "Install and enable CloudFormation helper scripts"
+  echo "Install CloudFormation helper scripts"
   mkdir -p /opt/aws/
   pip3 install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz
   sudo ln -s /usr/local/init/ubuntu/cfn-hup /etc/init.d/cfn-hup
@@ -213,8 +213,9 @@ sudo usermod -aG sudo solana
 cd /home/solana
 sudo mkdir ./bin
 
-echo "Downloading x86 binaries for version v$SOLANA_VERSION"
+ln -s /var/solana/data/ledger /home/solana
 
+echo "Downloading x86 binaries for version v$SOLANA_VERSION"
 sudo wget -q https://github.com/solana-labs/solana/releases/download/v$SOLANA_VERSION/solana-release-x86_64-unknown-linux-gnu.tar.bz2
 sudo tar -xjvf solana-release-x86_64-unknown-linux-gnu.tar.bz2
 sudo mv solana-release/bin/* ./bin/
@@ -233,22 +234,22 @@ else
 fi
 if [[ "$SOLANA_NODE_TYPE" == "consensus" ]]; then
     if [[ $NODE_IDENTITY_SECRET_ARN == "none" ]]; then
-        echo "Storing generated node identity to AWS Secrets Manager"
+        echo "Store node identity to AWS Secrets Manager"
         NODE_IDENTITY=$(sudo ./solana-keygen pubkey /home/solana/config/vote-account-keypair.json)
         sudo aws secretsmanager create-secret --name "solana-node/"$NODE_IDENTITY --description "Solana Node Identity Secret created for stack $CF_STACK_NAME" --secret-string file:///home/solana/config/validator-keypair.json --region $AWS_REGION
     fi
     if [[ $VOTE_ACCOUNT_SECRET_ARN == "none" ]]; then
         echo "Create Vote Account Secret"
         sudo ./solana-keygen new --no-passphrase -o /home/solana/config/vote-account-keypair.json
         NODE_IDENTITY=$(sudo ./solana-keygen pubkey /home/solana/config/vote-account-keypair.json)
-        echo "Storing Vote Account Secret to AWS Secrets Manager"
+        echo "Store Vote Account Secret to AWS Secrets Manager"
         sudo aws secretsmanager create-secret --name "solana-node/"$NODE_IDENTITY --description "Solana Vote Account Secret created for stack $CF_STACK_NAME" --secret-string file:///home/solana/config/vote-account-keypair.json --region $AWS_REGION
 
         if [[ $AUTHORIZED_WITHDRAWER_ACCOUNT_SECRET_ARN == "none" ]]; then
             echo "Create Authorized Withdrawer Account Secret"
             sudo ./solana-keygen new --no-passphrase -o /home/solana/config/authorized-withdrawer-keypair.json
             NODE_IDENTITY=$(sudo ./solana-keygen pubkey /home/solana/config/authorized-withdrawer-keypair.json)
-            echo "Storing Authorized Withdrawer Account  to AWS Secrets Manager"
+            echo "Store Authorized Withdrawer Account  to AWS Secrets Manager"
             sudo aws secretsmanager create-secret --name "solana-node/"$NODE_IDENTITY --description "Authorized Withdrawer Account Secret created for stack $CF_STACK_NAME" --secret-string file:///home/solana/config/authorized-withdrawer-keypair.json --region $AWS_REGION
 
         else
@@ -265,13 +266,13 @@ if [[ "$SOLANA_NODE_TYPE" == "consensus" ]]; then
           echo "Creating Vote Account on-chain"
           sudo ./solana create-vote-account /home/solana/config/vote-account-keypair.json /home/solana/config/validator-keypair.json /home/solana/config/authorized-withdrawer-keypair.json
 
-          echo "Deleting Transaction Funding Account Secret from the local disc"
+          echo "Delete Transaction Funding Account Secret from the local disc"
           sudo rm  /root/.config/solana/id.json
         else
           echo "Vote Account not created. Please create it manually: https://docs.solana.com/running-validator/validator-start#create-vote-account"
         fi
 
-        echo "Deleting Authorized Withdrawer Account from the local disc"
+        echo "Delete Authorized Withdrawer Account from the local disc"
         sudo rm /home/solana/config/authorized-withdrawer-keypair.json
     else
         echo "Get Vote Account Secret from AWS Secrets Manager"

lib/solana/lib/common-stack.ts

@@ -35,6 +35,16 @@ export class SolanaCommonStack extends cdk.Stack {
            resources: [`arn:aws:autoscaling:${region}:${this.AWS_ACCOUNT_ID}:autoScalingGroup:*:autoScalingGroupName/solana-*`],
            actions: ["autoscaling:CompleteLifecycleAction"],
           }));
+        
+        instanceRole.addToPolicy(
+            new iam.PolicyStatement({
+                resources: [
+                    `arn:aws:s3:::cloudformation-examples`,
+                    `arn:aws:s3:::cloudformation-examples/*`,
+                ],
+                actions: ["s3:ListBucket", "s3:*Object", "s3:GetBucket*"],
+            })
+        );
 
         new cdk.CfnOutput(this, "Instance Role ARN", {
             value: instanceRole.roleArn,