Solana. Upgade to new version 2.3.7+

vlasonfa · vlasonfa · commit 6f9793f0a981 · 2025-08-28T15:01:20.000+10:00
diff --git a/.github/workflows/blueprints-unit-tests.yml b/.github/workflows/blueprints-unit-tests.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 19
+          node-version: 20
           cache: npm
           cache-dependency-path: package-lock.json
 
diff --git a/lib/solana/lib/assets/node/build-binaries.sh b/lib/solana/lib/assets/node/build-binaries.sh
@@ -30,7 +30,7 @@ source $PWD/ci/rust-version.sh all
 
 echo "Installing libssl-dev, pkg-config, zlib1g-dev, protobuf etc."
 apt-get update
-apt-get -y install libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang cmake make libprotobuf-dev protobuf-compiler
+apt-get -y install libssl-dev libclang-dev libudev-dev pkg-config zlib1g-dev llvm clang cmake make libprotobuf-dev protobuf-compiler
 
 echo "Building Solana..."
 ./scripts/cargo-install-all.sh .
diff --git a/lib/solana/lib/assets/node/node-base-rpc-template.sh b/lib/solana/lib/assets/node/node-base-rpc-template.sh
@@ -24,7 +24,7 @@ __ENTRY_POINTS__ \
 --full-rpc-api \
 --rpc-port 8899 \
 --gossip-port 8800 \
---dynamic-port-range 8800-8816 \
+--dynamic-port-range 8800-8820 \
 --private-rpc \
 --rpc-bind-address $EC2_INTERNAL_IP \
 --wal-recovery-mode skip_any_corrupted_record \
diff --git a/lib/solana/lib/assets/node/node-extended-rpc-template.sh b/lib/solana/lib/assets/node/node-extended-rpc-template.sh
@@ -24,7 +24,7 @@ __ENTRY_POINTS__ \
 --full-rpc-api \
 --rpc-port 8899 \
 --gossip-port 8800 \
---dynamic-port-range 8800-8816 \
+--dynamic-port-range 8800-8820 \
 --private-rpc \
 --rpc-bind-address $EC2_INTERNAL_IP \
 --wal-recovery-mode skip_any_corrupted_record \
diff --git a/lib/solana/lib/config/node-config.ts b/lib/solana/lib/config/node-config.ts
@@ -34,7 +34,7 @@ export const baseNodeConfig: configTypes.SolanaBaseNodeConfig = {
     instanceType: new ec2.InstanceType(process.env.SOLANA_INSTANCE_TYPE ? process.env.SOLANA_INSTANCE_TYPE : "r6a.8xlarge"),
     instanceCpuType: process.env.SOLANA_CPU_TYPE?.toLowerCase() == "x86_64" ? ec2.AmazonLinuxCpuType.X86_64 : ec2.AmazonLinuxCpuType.ARM_64,
     solanaCluster: <configTypes.SolanaCluster> process.env.SOLANA_CLUSTER || "mainnet-beta",
-    solanaVersion: validateVersion(process.env.SOLANA_VERSION) || "2.1.16",
+    solanaVersion: validateVersion(process.env.SOLANA_VERSION) || "2.3.7",
     nodeConfiguration: <configTypes.SolanaNodeConfiguration> process.env.SOLANA_NODE_CONFIGURATION || "baserpc",
     dataVolume: {
         sizeGiB: process.env.SOLANA_DATA_VOL_SIZE ? parseInt(process.env.SOLANA_DATA_VOL_SIZE): 2000,
diff --git a/lib/solana/lib/constructs/node-security-group.ts b/lib/solana/lib/constructs/node-security-group.ts
@@ -24,8 +24,8 @@ export interface NodeSecurityGroupConstructProps {
       });
 
       // Public ports
-      sg.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcpRange(8800, 8816), "allow all TCP P2P protocols (gossip, turbine, repair, etc)");
-      sg.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.udpRange(8800, 8816), "allow all UDP P2P protocols (gossip, turbine, repair, etc)");
+      sg.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.tcpRange(8800, 8820), "allow all TCP P2P protocols (gossip, turbine, repair, etc)");
+      sg.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.udpRange(8800, 8820), "allow all UDP P2P protocols (gossip, turbine, repair, etc)");
 
       // Private ports restricted only to the VPC IP range
       sg.addIngressRule(ec2.Peer.ipv4(vpc.vpcCidrBlock), ec2.Port.tcp(8899), "allow internal RPC port HTTP (user access needs to be restricted. Allowed access only from internal IPs)");
diff --git a/lib/solana/sample-configs/.env-sample-baserpc-arm b/lib/solana/sample-configs/.env-sample-baserpc-arm
@@ -9,7 +9,7 @@ AWS_REGION="us-east-2"
 ## Common configuration parameters ##
 SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "testnet", "devnet"
 SOLANA_NODE_CONFIGURATION="baserpc"                   # All options:   "baserpc", "extendedrpc"
-SOLANA_VERSION="2.1.16"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
+SOLANA_VERSION="2.3.7"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
 SOLANA_LIMIT_OUT_TRAFFIC_MBPS=20              # Limit outbound traffic to X Mbit/sec from the node to optimize data transfer costs. Set to 0 to switch off. Default: 20 Mbit/s.
 
 SOLANA_INSTANCE_TYPE="r8g.12xlarge"
diff --git a/lib/solana/sample-configs/.env-sample-baserpc-x86 b/lib/solana/sample-configs/.env-sample-baserpc-x86
@@ -4,23 +4,23 @@
 
 ## Set the AWS account is and region for your environment ##
 AWS_ACCOUNT_ID="xxxxxxxxxxx"
-AWS_REGION="us-east-2"
+AWS_REGION="us-east-1"
 
 ## Common configuration parameters ##
 SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "testnet", "devnet"
 SOLANA_NODE_CONFIGURATION="baserpc"                   # All options:  "baserpc", "extendedrpc"
-SOLANA_VERSION="2.1.16"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
+SOLANA_VERSION="2.3.7"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
 SOLANA_LIMIT_OUT_TRAFFIC_MBPS=20              # Limit outbound traffic to X Mbit/sec from the node to optimize data transfer costs. Set to 0 to switch off. Default: 20 Mbit/s.
 
-SOLANA_INSTANCE_TYPE="r7a.12xlarge"
+SOLANA_INSTANCE_TYPE="i7i.12xlarge"
 SOLANA_CPU_TYPE="x86_64"                      # All options: "x86_64", "ARM_64". IMPORTANT: Make sure the CPU type matches the instance type used
 # Data volume configuration
-SOLANA_DATA_VOL_TYPE="io2"                    # 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
+SOLANA_DATA_VOL_TYPE="instance-store"                    # 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
 SOLANA_DATA_VOL_SIZE="2000"                   # Current required data size to keep both smapshot archive and unarchived version of it
 SOLANA_DATA_VOL_IOPS="17000"                  # Max IOPS for EBS volumes (not applicable for "instance-store")
 SOLANA_DATA_VOL_THROUGHPUT="700"              # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
 # Accounts volume configuration
-SOLANA_ACCOUNTS_VOL_TYPE="io2"                # 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
+SOLANA_ACCOUNTS_VOL_TYPE="instance-store"                # 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
 SOLANA_ACCOUNTS_VOL_SIZE="500"                # Current required data size to keep both smapshot archive and unarchived version of it
 SOLANA_ACCOUNTS_VOL_IOPS="17000"               # Max IOPS for EBS volumes (not applicable for "instance-store")
 SOLANA_ACCOUNTS_VOL_THROUGHPUT="700"          # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
diff --git a/lib/solana/sample-configs/.env-sample-extendedrpc-arm b/lib/solana/sample-configs/.env-sample-extendedrpc-arm
@@ -9,7 +9,7 @@ AWS_REGION="us-east-1"
 ## Common configuration parameters ##
 SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "testnet", "devnet"
 SOLANA_NODE_CONFIGURATION="extendedrpc"                   # All options:   "baserpc", "extendedrpc"
-SOLANA_VERSION="2.1.16"                       # Latest required version of Solana. Check for latest Mainnet version https://github.com/solana-labs/solana/releases
+SOLANA_VERSION="2.3.7"                       # Latest required version of Solana. Check for latest Mainnet version https://github.com/solana-labs/solana/releases
 SOLANA_LIMIT_OUT_TRAFFIC_MBPS=20              # Limit outbound traffic to X Mbit/sec from the node to optimize data transfer costs. Set to 0 to switch off. Default: 20 Mbit/s.
 
 SOLANA_INSTANCE_TYPE="i8g.16xlarge"
diff --git a/lib/solana/sample-configs/.env-sample-extendedrpc-x86 b/lib/solana/sample-configs/.env-sample-extendedrpc-x86
@@ -9,18 +9,18 @@ AWS_REGION="us-east-1"
 ## Common configuration parameters ##
 SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "testnet", "devnet"
 SOLANA_NODE_CONFIGURATION="extendedrpc"                   # All options:   "baserpc", "extendedrpc"
-SOLANA_VERSION="2.1.16"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
+SOLANA_VERSION="2.3.7"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
 SOLANA_LIMIT_OUT_TRAFFIC_MBPS=20              # Limit outbound traffic to X Mbit/sec from the node to optimize data transfer costs. Set to 0 to switch off. Default: 20 Mbit/s.
 
-SOLANA_INSTANCE_TYPE="r7a.24xlarge"
+SOLANA_INSTANCE_TYPE="i7i.24xlarge"
 SOLANA_CPU_TYPE="x86_64"                      # All options: "x86_64", "ARM_64". IMPORTANT: Make sure the CPU type matches the instance type used
 # Data volume configuration
-SOLANA_DATA_VOL_TYPE="io2"                    # 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
+SOLANA_DATA_VOL_TYPE="instance-store"                    # 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
 SOLANA_DATA_VOL_SIZE="2000"                   # Current required data size to keep both smapshot archive and unarchived version of it
 SOLANA_DATA_VOL_IOPS="20000"                  # Max IOPS for EBS volumes (not applicable for "instance-store")
 SOLANA_DATA_VOL_THROUGHPUT="700"              # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
 # Accounts volume configuration
-SOLANA_ACCOUNTS_VOL_TYPE="io2"                # 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
+SOLANA_ACCOUNTS_VOL_TYPE="instance-store"                # 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
 SOLANA_ACCOUNTS_VOL_SIZE="500"                # Current required data size to keep both smapshot archive and unarchived version of it
 SOLANA_ACCOUNTS_VOL_IOPS="20000"               # Max IOPS for EBS volumes (not applicable for "instance-store")
 SOLANA_ACCOUNTS_VOL_THROUGHPUT="700"          # Max throughput for EBS gp3 volumes (not applicable for "io1" | "io2" | "instance-store")
diff --git a/lib/solana/test/.env-test b/lib/solana/test/.env-test
@@ -9,7 +9,7 @@ AWS_REGION="us-east-2"
 ## Common configuration parameters ##
 SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "testnet", "devnet"
 SOLANA_NODE_CONFIGURATION="baserpc"                   # All options:   "baserpc", "extendedrpc"
-SOLANA_VERSION="2.1.16"                       # Current required version of Solana
+SOLANA_VERSION="2.3.7"                       # Current required version of Solana
 
 SOLANA_INSTANCE_TYPE="r6a.8xlarge"
 SOLANA_CPU_TYPE="x86_64"                      # All options: "x86_64", "ARM_64". IMPORTANT: Make sure the CPU type matches the instance type used
diff --git a/lib/solana/test/ha-nodes-stack.test.ts b/lib/solana/test/ha-nodes-stack.test.ts
@@ -38,14 +38,14 @@ describe("SolanaHANodesStack", () => {
           "Description": "allow all TCP P2P protocols (gossip, turbine, repair, etc)",
           "FromPort": 8800,
           "IpProtocol": "tcp",
-          "ToPort": 8816
+          "ToPort": 8820
          },
          {
           "CidrIp": "0.0.0.0/0",
           "Description": "allow all UDP P2P protocols (gossip, turbine, repair, etc)",
           "FromPort": 8800,
           "IpProtocol": "udp",
-          "ToPort": 8816
+          "ToPort": 8820
          },
          {
           "CidrIp": "1.2.3.4/5",
diff --git a/lib/solana/test/single-node-stack.test.ts b/lib/solana/test/single-node-stack.test.ts
@@ -37,14 +37,14 @@ describe("SolanaSingleNodeStack", () => {
           "Description": "allow all TCP P2P protocols (gossip, turbine, repair, etc)",
           "FromPort": 8800,
           "IpProtocol": "tcp",
-          "ToPort": 8816
+          "ToPort": 8820
          },
          {
           "CidrIp": "0.0.0.0/0",
           "Description": "allow all UDP P2P protocols (gossip, turbine, repair, etc)",
           "FromPort": 8800,
           "IpProtocol": "udp",
-          "ToPort": 8816
+          "ToPort": 8820
          },
          {
           "CidrIp": "1.2.3.4/5",
diff --git a/scripts/run-all-cdk-tests.sh b/scripts/run-all-cdk-tests.sh
@@ -26,7 +26,7 @@ run_test(){
 }
 
 # Run tests for each blueprint
-excluded_directories=("besu-private" "constructs" "wax" "polygon")
+excluded_directories=("besu-private" "includes" "constructs" "wax" "polygon")
 for dir in */; do
     # If dir is not in the array of excluded_directories, run test
     if [[ "${excluded_directories[*]}" =~ ${dir%/} ]]; then
