Merge branch 'main' into bsc

vlasonfa · vlasonfa · commit 10085372430c · 2024-03-26T16:47:04.000+11:00
diff --git a/lib/ethereum/README.md b/lib/ethereum/README.md
@@ -92,10 +92,10 @@ Create your own copy of `.env` file and edit it:
    # Make sure you are in aws-blockchain-node-runners/lib/ethereum
    cd lib/ethereum
    pwd
-   cp .env-sample .env
+   cp ./sample-configs/.env-geth-lighthouse .env
    nano .env
 ```
-   **NOTE:** Example configuration parameters are set in the local `.env-sample` file. You can find more examples inside `sample-configs` directory.
+   **NOTE:** You can find more examples inside the `sample-configs` directory.
 
 
 4. Deploy common components such as IAM role, and Amazon S3 bucket to store data snapshots
diff --git a/lib/ethereum/lib/assets/docker-compose/docker-compose-besu-teku.yml b/lib/ethereum/lib/assets/docker-compose/docker-compose-besu-teku.yml
@@ -4,7 +4,7 @@ services:
     besu_node:
         environment:
             - "JAVA_OPTS=-Xmx8g"
-        image: hyperledger/besu:24.1.2-SNAPSHOT
+        image: hyperledger/besu:24.3.0
         container_name: execution
         restart: always
         command:
@@ -43,7 +43,7 @@ services:
         environment:
             - "JAVA_OPTS=-Xmx4g"
             - "TEKU_OPTS=-XX:-HeapDumpOnOutOfMemoryError"
-        image: consensys/teku:24.1.0-jdk17
+        image: consensys/teku:24.3.0-jdk17
         container_name: consensus
         restart: always
         command:
diff --git a/lib/ethereum/lib/assets/docker-compose/docker-compose-erigon-lighthouse.yml b/lib/ethereum/lib/assets/docker-compose/docker-compose-erigon-lighthouse.yml
@@ -2,7 +2,7 @@
 version: "3"
 services:
   erigon_node:
-    image: thorax/erigon:2.57.0-__IMAGE_ARCH__
+    image: thorax/erigon:2.59.0-__IMAGE_ARCH__
     container_name: execution
     restart: always
     command:
@@ -43,7 +43,7 @@ services:
       - "30303:30303/udp"
 
   lighthouse_node:
-    image: sigp/lighthouse:v4.5.0
+    image: sigp/lighthouse:v5.1.2
     container_name: consensus
     restart: always
     command:
diff --git a/lib/ethereum/lib/assets/docker-compose/docker-compose-erigon-prysm.yml b/lib/ethereum/lib/assets/docker-compose/docker-compose-erigon-prysm.yml
@@ -2,7 +2,7 @@
 version: "3"
 services:
   erigon_node:
-    image: thorax/erigon:2.57.0-__IMAGE_ARCH__
+    image: thorax/erigon:2.59.0-__IMAGE_ARCH__
     container_name: execution
     restart: always
     command:
@@ -43,7 +43,7 @@ services:
       - "30303:30303/udp"
 
   prysm_node:
-    image: rocketpool/prysm:v4.2.0
+    image: rocketpool/prysm:v5.0.1
     container_name: consensus
     restart: always
     command:
diff --git a/lib/ethereum/lib/assets/docker-compose/docker-compose-geth-lighthouse.yml b/lib/ethereum/lib/assets/docker-compose/docker-compose-geth-lighthouse.yml
@@ -2,7 +2,7 @@
 version: "3"
 services:
     geth_node:
-        image: ethereum/client-go:v1.13.10
+        image: ethereum/client-go:v1.13.14
         container_name: execution
         restart: always
         command:
@@ -38,7 +38,7 @@ services:
             - "30303:30303/udp"
 
     lighthouse_node:
-        image: sigp/lighthouse:v4.5.0
+        image: sigp/lighthouse:v5.1.2
         container_name: consensus
         restart: always
         command:
diff --git a/lib/ethereum/lib/assets/docker-compose/docker-compose-nethermind-teku.yml b/lib/ethereum/lib/assets/docker-compose/docker-compose-nethermind-teku.yml
@@ -4,15 +4,14 @@ services:
     nethermind_node:
         environment:
             - "DOTNET_BUNDLE_EXTRACT_BASE_DIR=/var/lib/nethermind/data"
-        image: nethermind/nethermind:1.25.2
+        image: nethermind/nethermind:1.25.4
         container_name: execution
         restart: always
         command: [
                 "--config",
                 "mainnet",
                 "--datadir",
                 "/var/lib/nethermind/data",
-                # "--Sync.FastSync", "true",
                 "--Sync.SnapSync",
                 "true",
                 "--JsonRpc.JwtSecretFile",
@@ -54,7 +53,7 @@ services:
         environment:
             - "JAVA_OPTS=-Xmx4g"
             - "TEKU_OPTS=-XX:-HeapDumpOnOutOfMemoryError"
-        image: consensys/teku:24.1.0-jdk17
+        image: consensys/teku:24.3.0-jdk17
         container_name: consensus
         restart: always
         command:
diff --git a/lib/ethereum/lib/assets/node-cw-dashboard.ts b/lib/ethereum/lib/assets/node-cw-dashboard.ts
@@ -1,4 +1,4 @@
-export const SyncNodeCWDashboardJSON = {
+export const NodeCWDashboardJSON = {
     "widgets": [
         {
             "height": 5,
diff --git a/lib/ethereum/lib/common-stack.ts b/lib/ethereum/lib/common-stack.ts
@@ -74,6 +74,10 @@ export class EthCommonStack extends cdk.Stack {
                     `arn:aws:s3:::amazonlinux-2-repos-${region}/*`,
                     `arn:aws:s3:::${asset.s3BucketName}`,
                     `arn:aws:s3:::${asset.s3BucketName}/*`,
+                    "arn:aws:s3:::cloudformation-examples",
+                    "arn:aws:s3:::cloudformation-examples/*",
+                    "arn:aws:s3:::amazoncloudwatch-agent",
+                    "arn:aws:s3:::amazoncloudwatch-agent/*"
                 ],
                 actions: ["s3:ListBucket", "s3:*Object", "s3:GetBucket*"],
             })
diff --git a/lib/ethereum/lib/rpc-nodes-stack.ts b/lib/ethereum/lib/rpc-nodes-stack.ts
@@ -87,6 +87,7 @@ export class EthRpcNodesStack extends cdk.Stack {
             machineImage: new ec2.AmazonLinuxImage({
                 generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,
                 cpuType: instanceCpuType,
+                kernel: ec2.AmazonLinuxKernel.KERNEL5_X,
             }),
             role: instanceRole,
             vpc,
diff --git a/lib/ethereum/lib/single-node-stack.ts b/lib/ethereum/lib/single-node-stack.ts
@@ -63,13 +63,14 @@ export class EthSingleNodeStack extends cdk.Stack {
         asset.bucket.grantRead(instanceRole);
 
         // Setting up the node using generic Single Node constract
-        const syncNode = new SingleNodeConstruct(this, "single-node", {
+        const node = new SingleNodeConstruct(this, "single-node", {
             instanceName: STACK_NAME,
             instanceType,
             dataVolumes,
             machineImage: new ec2.AmazonLinuxImage({
                 generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,
                 cpuType: instanceCpuType,
+                kernel: ec2.AmazonLinuxKernel.KERNEL5_X,
             }),
             vpc,
             availabilityZone: chosenAvailabilityZone,
@@ -92,28 +93,28 @@ export class EthSingleNodeStack extends cdk.Stack {
             _AUTOSTART_CONTAINER_: "true",
             _FORMAT_DISK_: "true",
             _NODE_ROLE_:nodeRole,
-            _NODE_CF_LOGICAL_ID_: syncNode.nodeCFLogicalId,
+            _NODE_CF_LOGICAL_ID_: node.nodeCFLogicalId,
             _LIFECYCLE_HOOK_NAME_: "",
             _AUTOSCALING_GROUP_NAME_: "",
         });
 
         // Adding modified userdata script to the instance prepared fro us by Single Node constract
-        syncNode.instance.addUserData(modifiedUserData);
+        node.instance.addUserData(modifiedUserData);
 
         // Adding CloudWatch dashboard to the node
-        const dashboardString = cdk.Fn.sub(JSON.stringify(nodeCwDashboard.SyncNodeCWDashboardJSON), {
-            INSTANCE_ID:syncNode.instanceId,
+        const dashboardString = cdk.Fn.sub(JSON.stringify(nodeCwDashboard.NodeCWDashboardJSON), {
+            INSTANCE_ID:node.instanceId,
             INSTANCE_NAME: STACK_NAME,
             REGION: REGION,
         })
 
         new cw.CfnDashboard(this, 'single-cw-dashboard', {
-            dashboardName: STACK_NAME,
+            dashboardName: `${STACK_NAME}-${node.instanceId}`,
             dashboardBody: dashboardString,
         });
 
         new cdk.CfnOutput(this, "single-instance-id", {
-            value: syncNode.instanceId,
+            value: node.instanceId,
         });
 
         // Adding suppressions to the stack
diff --git a/lib/ethereum/test/solo-node-stack.test.ts b/lib/ethereum/test/solo-node-stack.test.ts
@@ -156,7 +156,17 @@ describe("EthSyncNodeStack", () => {
     // Has CloudWatch dashboard.
     template.hasResourceProperties("AWS::CloudWatch::Dashboard", {
       DashboardBody: Match.anyValue(),
-      DashboardName: `eth-single-node-${config.baseConfig.clientCombination}`
+      DashboardName: {
+        "Fn::Join": [
+         "",
+         [
+          "eth-single-node-geth-lighthouse-",
+          {
+           "Ref": Match.anyValue()
+          }
+         ]
+        ]
+       }
     })
 
  });
diff --git a/lib/ethereum/test/sync-node-stack.test.ts b/lib/ethereum/test/sync-node-stack.test.ts
@@ -156,7 +156,17 @@ describe("EthSyncNodeStack", () => {
     // Has CloudWatch dashboard.
     template.hasResourceProperties("AWS::CloudWatch::Dashboard", {
       DashboardBody: Match.anyValue(),
-      DashboardName: `eth-sync-node-${config.baseConfig.clientCombination}`
+      DashboardName: {
+        "Fn::Join": [
+         "",
+         [
+          "eth-sync-node-geth-lighthouse-",
+          {
+            "Ref": Match.anyValue()
+          }
+         ]
+        ]
+       }
     })
 
  });
diff --git a/lib/solana/README.md b/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
 ```
 
diff --git a/lib/solana/lib/assets/node-cw-dashboard.ts b/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"
+            }
         }
     ]
 }
diff --git a/lib/solana/lib/assets/solana/node-consensus-template.sh b/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)
 
diff --git a/lib/solana/lib/assets/solana/node-heavy-rpc-template.sh b/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)
 
diff --git a/lib/solana/lib/assets/solana/node-light-rpc-template.sh b/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 \
diff --git a/lib/solana/lib/assets/user-data/node.sh b/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"
diff --git a/lib/solana/lib/common-stack.ts b/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,
diff --git a/lib/solana/package-lock.json b/lib/solana/package-lock.json
diff --git a/lib/solana/test/single-node-stack.test.ts b/lib/solana/test/single-node-stack.test.ts
diff --git a/lib/solana/tsconfig.json b/lib/solana/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export const SyncNodeCWDashboardJSON = {`
	`1`	`+export const NodeCWDashboardJSON = {`
`2`	`2`	`"widgets": [`
`3`	`3`	`{`
`4`	`4`	`"height": 5,`