Merge branch 'main' into bsc

Author: vlasonfa

lib/solana/README.md

@@ -129,6 +129,7 @@ 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
 ```
 
@@ -149,7 +150,7 @@ Create your own copy of `.env` file and edit it to update with your AWS Account
 
 ```bash
    INSTANCE_ID=$(cat single-node-deploy.json | jq -r '..|.nodeinstanceid? | select(. != null)')
-   NODE_INTERNAL_IP=$(aws ec2 describe-instances --instance-ids $INSTANCE_ID --query 'Reservations[*].Instances[*].PublicIpAddress' --output text)
+   NODE_INTERNAL_IP=$(aws ec2 describe-instances --instance-ids $INSTANCE_ID --query 'Reservations[*].Instances[*].PrivateIpAddress' --output text)
     # We query token balance this account: https://solanabeach.io/address/9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM
     curl http://$NODE_INTERNAL_IP:8899 -X POST -H "Content-Type: application/json" \
     --data '{ "jsonrpc": "2.0", "id": 1, "method": "getBalance", "params": ["9WzDXwBbmkg8ZTbNMqUxvQRAyrZzDsGYdLVL9zYtAWWM"]}'

lib/solana/sample-configs/.env-sample-baserpc

@@ -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:   "consensus", "baserpc", "extendedrpc"
-SOLANA_VERSION="1.17.20"                       # Current required version of Solana
+SOLANA_VERSION="1.17.22"                       # Latest required version of Solana. Check for latest Mainnet version https://github.com/solana-labs/solana/releases
 
 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

lib/solana/sample-configs/.env-sample-consensus

@@ -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="consensus"                   # All options:   "consensus", "baserpc", "extendedrpc"
-SOLANA_VERSION="1.17.20"                       # Current required version of Solana
+SOLANA_VERSION="1.17.22"                       # Latest required version of Solana. Check for latest Mainnet version https://github.com/solana-labs/solana/releases
 
 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

lib/solana/sample-configs/.env-sample-extendedrpc

@@ -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="extendedrpc"                   # All options:   "consensus", "baserpc", "extendedrpc"
-SOLANA_VERSION="1.17.20"                       # Current required version of Solana
+SOLANA_VERSION="1.17.22"                       # Latest required version of Solana. Check for latest Mainnet version https://github.com/solana-labs/solana/releases
 
 SOLANA_INSTANCE_TYPE="x2idn.16xlarge"
 SOLANA_CPU_TYPE="x86_64"                      # All options: "x86_64", "ARM_64". IMPORTANT: Make sure the CPU type matches the instance type used