missed commits and minor cleanup

Pedro Aceves · Pedro Aceves · commit 526c1babd95d · 2025-02-05T21:09:07.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ ha-nodes-deploy*.json
 .env
 .idea
 .vscode
+.venv
diff --git a/lib/xrp/app.ts b/lib/xrp/app.ts
@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+import "dotenv/config";
+import * as cdk from "aws-cdk-lib";
+import * as nag from "cdk-nag";
+import * as config from "./lib/config/XRPConfig";
+
+import { XRPSingleNodeStack } from "./lib/single-node-stack";
+import { XRPCommonStack } from "./lib/common-stack";
+import { XRPHANodesStack } from "./lib/ha-nodes-stack";
+
+const app = new cdk.App();
+cdk.Tags.of(app).add("Project", "AWSXRP");
+
+const commonStack = new XRPCommonStack(app, "XRP-common", {
+    stackName: `XRP-nodes-common`,
+    env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
+});
+
+new XRPSingleNodeStack(app, "XRP-single-node", {
+    env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
+    stackName: `XRP-single-node`,
+    instanceType: config.baseNodeConfig.instanceType,
+    instanceCpuType: config.baseNodeConfig.instanceCpuType,
+    dataVolume: config.baseNodeConfig.dataVolume,
+    hubNetworkID: config.baseNodeConfig.hubNetworkID,
+    instanceRole: commonStack.instanceRole,
+});
+
+    new XRPHANodesStack(app, "XRP-ha-nodes", {
+        stackName: "xrp-ha-nodes",
+        env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
+        instanceType: config.baseNodeConfig.instanceType,
+        instanceCpuType: config.baseNodeConfig.instanceCpuType,
+        dataVolume: config.baseNodeConfig.dataVolume,
+        hubNetworkID: config.baseNodeConfig.hubNetworkID,
+        instanceRole: commonStack.instanceRole,
+        albHealthCheckGracePeriodMin: config.haNodeConfig.albHealthCheckGracePeriodMin,
+        heartBeatDelayMin: config.haNodeConfig.heartBeatDelayMin,
+        numberOfNodes: config.haNodeConfig.numberOfNodes,
+    });
+
+// Security Check
+cdk.Aspects.of(app).add(
+    new nag.AwsSolutionsChecks({
+        verbose: false,
+        reports: true,
+        logIgnores: false,
+    })
+);
diff --git a/lib/xrp/lib/config/XRPConfig.ts b/lib/xrp/lib/config/XRPConfig.ts
@@ -1,8 +1,7 @@
 import * as ec2 from "aws-cdk-lib/aws-ec2";
 import * as configTypes from "../../../constructs/config.interface";
 import * as constants from "../../../constructs/constants";
-import * as xrp from "./XRPConfig.interface"
-import { BaseNodeConfig } from "../../../constructs/config.interface";
+import * as xrp from "./XRPConfig.interface";
 
 
 const parseDataVolumeType = (dataVolumeType: string) => {
@@ -36,13 +35,7 @@ export const baseNodeConfig: xrp.XRPBaseNodeConfig = {
         iops: process.env.DATA_VOL_IOPS ? parseInt(process.env.DATA_VOL_IOPS): 12000,
         throughput: process.env.DATA_VOL_THROUGHPUT ? parseInt(process.env.DATA_VOL_THROUGHPUT): 700,
     },
-    // hubNetworkIP: process.env.HUB_NETWORK_IP || "s.altnet.rippletest.net 51235", //testnet
-    hubNetworkID: process.env.HUB_NETWORK_ID || "testnet",
-    // onlineDelete: process.env.ONLINE_DELETE || "512",
-    // advisoryDelete: process.env.ADVISORY_DELETE || "1",
-    // validatorListSites: process.env.VALIDATOR_LIST_SITES || "https://vl.altnet.rippletest.net", //testnet
-    // validatorListKeys: process.env.VALIDATOR_LIST_KEYS || "https://vl.altnet.rippletest.net" //testnet
-
+    hubNetworkID: process.env.HUB_NETWORK_ID || "testnet"
 };
 
 
diff --git a/lib/xrp/lib/ha-nodes-stack.ts b/lib/xrp/lib/ha-nodes-stack.ts
@@ -9,8 +9,6 @@ import { HANodesConstruct } from "../../constructs/ha-rpc-nodes-with-alb";
 import * as constants from "../../constructs/constants";
 import { XRPSingleNodeStackProps } from "./single-node-stack";
 import { XRPNodeSecurityGroupConstruct } from "./constructs/xrp-node-security-group";
-import { SingleNodeCWDashboardJSON } from "./constructs/node-cw-dashboard";
-import * as cw from 'aws-cdk-lib/aws-cloudwatch';
 
 export interface XRPHANodesStackProps extends XRPSingleNodeStackProps {
     albHealthCheckGracePeriodMin: number;
@@ -36,33 +34,25 @@ export class XRPHANodesStack extends cdk.Stack {
             dataVolume: dataVolume,
             stackName,
             hubNetworkID,
-            // hubNetworkIP,
-            // validatorListSites,
-            // validatorListKeys,
-            // onlineDelete,
-            // advisoryDelete,
             albHealthCheckGracePeriodMin,
             heartBeatDelayMin,
-            numberOfNodes,
+            numberOfNodes
         } = props;
 
         // Using default VPC
         const vpc = ec2.Vpc.fromLookup(this, "vpc", { isDefault: true });
 
         // Setting up the security group for the node from Solana-specific construct
         const instanceSG = new XRPNodeSecurityGroupConstruct(this, "security-group", {
-            vpc: vpc,
+            vpc: vpc
         });
 
         // Making our scripts and configis from the local "assets" directory available for instance to download
         const asset = new s3Assets.Asset(this, "assets", {
-            path: path.join(__dirname, "assets"),
+            path: path.join(__dirname, "assets")
         });
 
-        // Getting the IAM role ARN from the common stack
-        const importedInstanceRoleArn = cdk.Fn.importValue("SolanaNodeInstanceRoleArn");
-
-        const instanceRole = props.instanceRole; //iam.Role.fromRoleArn(this, "iam-role", importedInstanceRoleArn);
+        const instanceRole = props.instanceRole;
 
         // Making sure our instance will be able to read the assets
         asset.bucket.grantRead(instanceRole);
@@ -90,7 +80,7 @@ export class XRPHANodesStack extends cdk.Stack {
                         .replace("_HUB_NETWORK_ID_", hubNetworkID)
                         .replace("_LIFECYCLE_HOOK_NAME_", lifecycleHookName)
                         .replace("_ASG_NAME_", autoScalingGroupName);
-                },
+                }
             })
         );
 
@@ -101,7 +91,7 @@ export class XRPHANodesStack extends cdk.Stack {
             rootDataVolumeDeviceName: "/dev/xvda",
             machineImage: new ec2.AmazonLinuxImage({
                 generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,
-                cpuType: ec2.AmazonLinuxCpuType.X86_64,
+                cpuType: ec2.AmazonLinuxCpuType.X86_64
             }),
             vpc,
             role: instanceRole,
@@ -113,16 +103,13 @@ export class XRPHANodesStack extends cdk.Stack {
             heartBeatDelayMin,
             lifecycleHookName: lifecycleHookName,
             autoScalingGroupName: autoScalingGroupName,
-            rpcPortForALB: 6005,
+            rpcPortForALB: 6005
         });
 
-        
-
-        
 
         // Making sure we output the URL of our Applicaiton Load Balancer
         new cdk.CfnOutput(this, "alb-url", {
-            value: nodeASG.loadBalancerDnsName,
+            value: nodeASG.loadBalancerDnsName
         });
 
         // Adding suppressions to the stack
@@ -131,20 +118,20 @@ export class XRPHANodesStack extends cdk.Stack {
             [
                 {
                     id: "AwsSolutions-AS3",
-                    reason: "No notifications needed",
+                    reason: "No notifications needed"
                 },
                 {
                     id: "AwsSolutions-S1",
-                    reason: "No access log needed for ALB logs bucket",
+                    reason: "No access log needed for ALB logs bucket"
                 },
                 {
                     id: "AwsSolutions-EC28",
-                    reason: "Using basic monitoring to save costs",
+                    reason: "Using basic monitoring to save costs"
                 },
                 {
                     id: "AwsSolutions-IAM5",
-                    reason: "Need read access to the S3 bucket with assets",
-                },
+                    reason: "Need read access to the S3 bucket with assets"
+                }
             ],
             true
         );
diff --git a/lib/xrp/lib/single-node-stack.ts b/lib/xrp/lib/single-node-stack.ts
@@ -12,7 +12,6 @@ import { XRPNodeSecurityGroupConstruct } from "./constructs/xrp-node-security-gr
 import { SingleNodeCWDashboardJSON } from "./constructs/node-cw-dashboard";
 import { DataVolumeConfig } from "../../constructs/config.interface";
 import * as constants from "../../constructs/constants";
-import { parseRippledConfig } from "./config/createIniFile";
 
 
 export interface XRPSingleNodeStackProps extends cdk.StackProps {
@@ -58,9 +57,6 @@ export class XRPSingleNodeStack extends cdk.Stack {
             path: path.join(__dirname, "assets")
         });
 
-        // Getting the IAM role ARN from the common stack
-        const importedInstanceRoleArn = cdk.Fn.importValue("XRPNodeInstanceRoleArn");
-
         const instanceRole = props.instanceRole; //iam.Role.fromRoleArn(this, "iam-role", importedInstanceRoleArn);
 
         // Making sure our instance will be able to read the assets
diff --git a/lib/xrp/package.json b/lib/xrp/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "aws-blockchain-node-runners-xrp",
+  "version": "0.2.0",
+  "scripts": {
+    "build": "npx tsc",
+    "watch": "npx tsc -w",
+    "test": "npx jest --detectOpenHandles",
+    "cdk": "npx cdk",
+    "scan-cdk": "npx cdk synth"
+  },
+  "dependencies": {
+    "ini": "^4.1.1"
+  },
+  "devDependencies": {
+    "@types/ini": "^4.1.1"
+  }
+}
diff --git a/lib/xrp/sample-configs/.env-sample-testnet b/lib/xrp/sample-configs/.env-sample-testnet
@@ -0,0 +1,13 @@
+AWS_ACCOUNT_ID="xxxxxxxxxxx"
+AWS_REGION="xxxxxxxxxx"
+XRP_INSTANCE_TYPE="r7a.12xlarge"
+XRP_CPU_TYPE="x86_64" # All options: "x86_64". ARM currently not supported
+DATA_VOL_TYPE="gp3"                    # Other options: "io1" | "io2" | "gp3" | "instance-store" . IMPORTANT: Use "instance-store" option only with instance types that support that feature, like popular for node im4gn, d3, i3en, and i4i instance families
+DATA_VOL_SIZE="2000"                   # Current required data size to keep both smapshot archive and unarchived version of it
+DATA_VOL_IOPS="12000"                  # Max IOPS for EBS volumes (not applicable for "instance-store")
+DATA_VOL_THROUGHPUT="700"
+XRP_HA_ALB_HEALTHCHECK_GRACE_PERIOD_MIN="60"
+XRP_HA_NODES_HEARTBEAT_DELAY_MIN="5"
+XRP_HA_NUMBER_OF_NODES="2"
+HUB_NETWORK_ID="testnet"
+
diff --git a/lib/xrp/tsconfig.json b/lib/xrp/tsconfig.json
@@ -0,0 +1,31 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": [
+      "es2020",
+      "dom"
+    ],
+    "declaration": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noImplicitThis": true,
+    "alwaysStrict": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": false,
+    "inlineSourceMap": true,
+    "inlineSources": true,
+    "experimentalDecorators": true,
+    "strictPropertyInitialization": false,
+    "typeRoots": [
+      "../../node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "node_modules",
+    "cdk.out"
+  ]
+}

-Original file line number
+Diff line change
 .env
 .idea
 .vscode
 +.venv