Merge branch 'main' into main

frbrkoala · web-flow · commit e4c0ef5f77c4 · 2025-03-03T10:25:41.000+11:00
diff --git a/lib/solana/README.md b/lib/solana/README.md
@@ -123,7 +123,7 @@ aws ec2 create-default-vpc
 Create your own copy of `.env` file and edit it to update with your AWS Account ID and Region:
 ```bash
 cd lib/solana
-cp ./sample-configs/.env-sample-baserpc-arm .env
+cp ./sample-configs/.env-sample-baserpc-x86 .env
 nano .env
 ```
 > **NOTE:** *You can find more examples inside `sample-configs` directory: ARM-powered and x86-powered setups, base and extended RPC configurations.*
diff --git a/lib/solana/sample-configs/.env-sample-baserpc-x86 b/lib/solana/sample-configs/.env-sample-baserpc-x86
@@ -14,14 +14,14 @@ SOLANA_VERSION="2.0.19"                       # Latest required version of Agave
 SOLANA_INSTANCE_TYPE="r7a.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="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
+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_SIZE="2000"                   # Current required data size to keep both smapshot archive and unarchived version of it
-SOLANA_DATA_VOL_IOPS="9000"                  # Max IOPS for EBS volumes (not applicable for "instance-store")
+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="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
+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_SIZE="500"                # Current required data size to keep both smapshot archive and unarchived version of it
-SOLANA_ACCOUNTS_VOL_IOPS="6000"               # Max IOPS for EBS volumes (not applicable for "instance-store")
+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")
 # Secrets configuration
 SOLANA_NODE_IDENTITY_SECRET_ARN="none"                            # Optional. The ARN of the secret in AWS Secrets Manager with the node identity key pair. In case you want to provision a node but keep the old identity.
diff --git a/lib/solana/sample-configs/.env-sample-extendedrpc-x86 b/lib/solana/sample-configs/.env-sample-extendedrpc-x86
@@ -11,17 +11,17 @@ SOLANA_CLUSTER="mainnet-beta"                 # All options:  "mainnet-beta", "t
 SOLANA_NODE_CONFIGURATION="extendedrpc"                   # All options:   "baserpc", "extendedrpc"
 SOLANA_VERSION="2.0.19"                       # Latest required version of Agave above 2.x. Check for latest Mainnet version https://github.com/anza-xyz/agave/releases
 
-SOLANA_INSTANCE_TYPE="r7a.16xlarge"
+SOLANA_INSTANCE_TYPE="r7a.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_SIZE="2000"                   # Current required data size to keep both smapshot archive and unarchived version of it
-SOLANA_DATA_VOL_IOPS="10000"                  # Max IOPS for EBS volumes (not applicable for "instance-store")
+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_SIZE="400"                # Current required data size to keep both smapshot archive and unarchived version of it
-SOLANA_ACCOUNTS_VOL_IOPS="10000"               # Max IOPS for EBS volumes (not applicable for "instance-store")
+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")
 # Secrets configuration
 SOLANA_NODE_IDENTITY_SECRET_ARN="none"                            # Optional. The ARN of the secret in AWS Secrets Manager with the node identity key pair. In case you want to provision a node but keep the old identity.
diff --git a/lib/stacks/lib/config/stacksConfigDefaults.ts b/lib/stacks/lib/config/stacksConfigDefaults.ts
@@ -32,13 +32,13 @@ export function stacksNodeConfigDefaults(
     const defaultStacksNetworkConfig: configTypes.StacksNetworkConfig = stacksNetwork === "mainnet"
         ? {
             stacksNetwork: "mainnet",
-            stacksBootstrapNode: "02196f005965cebe6ddc3901b7b1cc1aa7a88f305bb8c5893456b8f9a605923893@seed.mainnet.hiro.so:20444,02539449ad94e6e6392d8c1deb2b4e61f80ae2a18964349bc14336d8b903c46a8c@cet.stacksnodes.org:20444,02ececc8ce79b8adf813f13a0255f8ae58d4357309ba0cedd523d9f1a306fcfb79@sgt.stacksnodes.org:20444,0303144ba518fe7a0fb56a8a7d488f950307a4330f146e1e1458fc63fb33defe96@est.stacksnodes.org:20444",
+            stacksBootstrapNode: "02da7a464ac770ae8337a343670778b93410f2f3fef6bea98dd1c3e9224459d36b@seed-0.mainnet.stacks.co:20444,02afeae522aab5f8c99a00ddf75fbcb4a641e052dd48836408d9cf437344b63516@seed-1.mainnet.stacks.co:20444,03652212ea76be0ed4cd83a25c06e57819993029a7b9999f7d63c36340b34a4e62@seed-2.mainnet.stacks.co:20444",
             stacksChainstateArchive: "https://archive.hiro.so/mainnet/stacks-blockchain/mainnet-stacks-blockchain-latest.tar.gz",
             stacksP2pPort: 20444,
             stacksRpcPort: 20443,
-            bitcoinPeerHost: "bitcoind.stacks.co",
-            bitcoinRpcUsername: "blockstack",
-            bitcoinRpcPassword: "blockstacksystem",
+            bitcoinPeerHost: "bitcoin.mainnet.stacks.org",
+            bitcoinRpcUsername: "stacks",
+            bitcoinRpcPassword: "foundation",
             bitcoinP2pPort: 8333,
             bitcoinRpcPort: 8332,
         }
@@ -48,9 +48,9 @@ export function stacksNodeConfigDefaults(
             stacksChainstateArchive: "https://archive.hiro.so/testnet/stacks-blockchain/testnet-stacks-blockchain-latest.tar.gz",
             stacksP2pPort: 20444,
             stacksRpcPort: 20443,
-            bitcoinPeerHost: "bitcoind.testnet.stacks.co",
-            bitcoinRpcUsername: "blockstack",
-            bitcoinRpcPassword: "blockstacksystem",
+            bitcoinPeerHost: "bitcoin.testnet.stacks.org",
+            bitcoinRpcUsername: "stacks",
+            bitcoinRpcPassword: "foundation",
             bitcoinP2pPort: 18333,
             bitcoinRpcPort: 18332,
         }
diff --git a/lib/stacks/sample-configs/.env-sample-follower b/lib/stacks/sample-configs/.env-sample-follower
@@ -22,9 +22,9 @@ STACKS_NODE_CONFIGURATION="follower"                          # Node configurati
 STACKS_NETWORK="mainnet"                                      # Network onto which this node should connect. One of "mainnet", "testnet", "xenon", "helium", "mocknet"
 # STACKS_P2P_PORT=20444                                       # Port for P2P network connections. IMPORTANT: Replace with valid port number
 # STACKS_RPC_PORT=20443                                       # Port for RPC connections. IMPORTANT: Replace with valid port number
-# BITCOIN_PEER_HOST="bitcoind.stacks.co"                      # Hostname of the Bitcoin peer node. REQUIRED for connection to Bitcoin network
-# BITCOIN_RPC_USERNAME="blockstack"                           # Username for Bitcoin RPC authentication
-# BITCOIN_RPC_PASSWORD="blockstacksystem"                     # Password for Bitcoin RPC authentication
+# BITCOIN_PEER_HOST="bitcoin.mainnet.stacks.org"              # Hostname of the Bitcoin peer node. REQUIRED for connection to Bitcoin network
+# BITCOIN_RPC_USERNAME="stacks"                               # Username for Bitcoin RPC authentication
+# BITCOIN_RPC_PASSWORD="foundation"                           # Password for Bitcoin RPC authentication
 # BITCOIN_RPC_PORT=8332                                       # Port for Bitcoin RPC connections
 # BITCOIN_P2P_PORT=8333                                       # Port for Bitcoin P2P network connections
 
