[Tracking] Pre-release of the mainnet branch

.circleci/config.yml

@@ -160,7 +160,7 @@ commands:
 jobs:
   integration:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial_long:
@@ -169,7 +169,7 @@ jobs:
 
   snarkos:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial:
@@ -178,7 +178,7 @@ jobs:
 
   account:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -187,7 +187,7 @@ jobs:
 
   cli:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -196,7 +196,7 @@ jobs:
 
   display:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -205,7 +205,7 @@ jobs:
 
   node:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial:
@@ -214,7 +214,7 @@ jobs:
 
   node-bft:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial:
@@ -223,7 +223,7 @@ jobs:
 
   node-bft-events:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial:
@@ -232,7 +232,7 @@ jobs:
 
   node-bft-ledger-service:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -241,7 +241,7 @@ jobs:
 
   node-bft-storage-service:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -250,7 +250,7 @@ jobs:
 
   node-cdn:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -259,7 +259,7 @@ jobs:
 
   node-consensus:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - run_serial:
@@ -268,7 +268,7 @@ jobs:
 
   node-rest:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -277,7 +277,7 @@ jobs:
 
   node-router:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -286,7 +286,7 @@ jobs:
 
   node-router-messages:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -295,7 +295,7 @@ jobs:
 
   node-sync:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -304,7 +304,7 @@ jobs:
 
   node-sync-communication-service:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -313,7 +313,7 @@ jobs:
 
   node-sync-locators:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -322,7 +322,7 @@ jobs:
 
   node-tcp:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - run_serial:
@@ -331,7 +331,7 @@ jobs:
 
   check-fmt:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: xlarge
     steps:
       - checkout
@@ -347,7 +347,7 @@ jobs:
 
   check-clippy:
     docker:
-      - image: cimg/rust:1.74.1
+      - image: cimg/rust:1.76.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
     resource_class: 2xlarge
     steps:
       - checkout
@@ -420,6 +420,6 @@ workflows:
           filters:
             branches:
               only:
-                - testnet3
+                - mainnet
     jobs:
       - integration

.devnet/.analytics/analytics.js

@@ -6,6 +6,44 @@ const yargs = require('yargs');
 const dimStart = "\x1b[2m";
 const dimEnd = "\x1b[0m";
 
+// Function to get the IP address of a given AWS node
+async function getIPAddress(awsNodeName) {
+    // Read the ~/.ssh/config file
+    const sshConfigFile = fs.readFileSync(`${process.env.HOME}/.ssh/config`, 'utf8');
+
+    // Use regular expressions to extract the associated IP address
+    const regex = new RegExp(`Host\\s+${awsNodeName}[\\s\\S]*?HostName\\s+(\\S+)`);
+    const match = sshConfigFile.match(regex);
+
+    if (match && match[1]) {
+        return match[1];
+    } else {
+        console.error(`No IP address found for ${awsNodeName} in ~/.ssh/config`);
+    }
+}
+
+// Function to get the count of AWS nodes based on the naming convention aws-nXX in the SSH config file
+async function getAWSNodeCount() {
+    // Read the ~/.ssh/config file
+    const sshConfigFile = fs.readFileSync(`${process.env.HOME}/.ssh/config`, 'utf8');
+
+    // Regular expression to match all aws-nXX formats
+    const regex = /Host\s+(aws-n\d+)/g;
+    let match;
+    let highestNumber = -1;
+
+    // Iterate over all matches and find the highest number
+    while ((match = regex.exec(sshConfigFile)) !== null) {
+        const nodeNumber = parseInt(match[1].replace('aws-n', ''), 10);
+        if (nodeNumber > highestNumber) {
+            highestNumber = nodeNumber;
+        }
+    }
+
+    // Return the count of nodes, adding 1 because it starts from 0
+    return highestNumber >= 0 ? highestNumber + 1 : 0;
+}
+
 // Function to fetch block data
 async function fetchBlockData(baseUrl, height) {
     try {
@@ -77,10 +115,32 @@ async function calculateRoundsInBlocks(baseUrl, latestHeight) {
     }
 }
 
+async function checkBlockHash(blockHeight) {
+    const numNodes = await getAWSNodeCount();
+    console.log(`Detected ${numNodes} AWS nodes... \n`);
+
+    for (let i = 0; i < numNodes; i++) {
+        // Define the AWS node name to search for (e.g., aws-n1)
+        const awsNodeName = `aws-n${i}`;
+        // Get the IP address of the AWS node
+        const ipAddress = await getIPAddress(awsNodeName);
+        // Define the base URL for the node
+        const baseUrl = `http://${ipAddress}:3030/mainnet/block`;
+
+        // Fetch the block data
+        const blockData = await fetchBlockData(baseUrl, blockHeight);
+        if (blockData && blockData.block_hash) {
+            console.log(`${awsNodeName} - Block ${blockHeight} - ${blockData.block_hash}`);
+        } else {
+            console.log(`${awsNodeName} - Block ${blockHeight} - No block hash found`);
+        }
+    }
+}
+
 // Main function to fetch block metrics
-async function fetchBlockMetrics(baseUrl, metricType) {
+async function fetchBlockMetrics(metricType, optionalBlockHeight) {
     // Function to get the latest block height
-    async function getLatestBlockHeight() {
+    async function getLatestBlockHeight(baseUrl) {
         try {
             const response = await axios.get(`${baseUrl}/height/latest`);
             const latestHeight = response.data;
@@ -92,7 +152,17 @@ async function fetchBlockMetrics(baseUrl, metricType) {
         }
     }
 
-    const latestHeight = await getLatestBlockHeight();
+    // Define the AWS node name to search for (e.g., aws-n1)
+    const awsNodeName = 'aws-n1';
+    // Get the IP address of the AWS node
+    const ipAddress = await getIPAddress(awsNodeName);
+    // Define the base URL for the node.
+    const baseUrl = `http://${ipAddress}:3030/mainnet/block`;
+
+    console.log(`${dimStart}IP Address: ${ipAddress}${dimEnd}`);
+    console.log(`${dimStart}Base URL: ${baseUrl}${dimEnd}`);
+
+    const latestHeight = await getLatestBlockHeight(baseUrl);
     if (latestHeight === null) {
         console.error('Unable to fetch latest block height, try again...');
         return;
@@ -104,6 +174,8 @@ async function fetchBlockMetrics(baseUrl, metricType) {
         calculateAverageBlockTime(baseUrl, latestHeight);
     } else if (metricType === 'roundsInBlocks') {
         calculateRoundsInBlocks(baseUrl, latestHeight);
+    } else if (metricType === 'checkBlockHash' && optionalBlockHeight) {
+        checkBlockHash(optionalBlockHeight);
     } else {
         console.error('Invalid metric type. Supported types: "averageBlockTime" or "roundsInBlocks".');
     }
@@ -115,35 +187,27 @@ async function main() {
         .options({
             'metric-type': {
                 alias: 'm',
-                describe: 'Metric type to fetch (averageBlockTime or roundsInBlocks)',
+                describe: 'Metric type to fetch (averageBlockTime, roundsInBlocks, or checkBlockHash)',
                 demandOption: true,
-                choices: ['averageBlockTime', 'roundsInBlocks'],
+                choices: ['averageBlockTime', 'roundsInBlocks', 'checkBlockHash'],
+            },
+            'block-height': {
+                alias: 'b',
+                describe: 'Block height to examine for checkBlockHash metric',
+                type: 'number',
             },
         })
+        .check((argv) => {
+            // Check if metric-type is checkBlockHash and block-height is provided
+            if (argv['metric-type'] === 'checkBlockHash' && (isNaN(argv['block-height']) || argv['block-height'] == null)) {
+                throw new Error('Block height is required when metric-type is checkBlockHash');
+            }
+            return true; // Indicate that the arguments passed the check
+        })
         .argv;
 
-    // Read the ~/.ssh/config file
-    const sshConfigFile = fs.readFileSync(`${process.env.HOME}/.ssh/config`, 'utf8');
-
-    // Define the AWS node name to search for (e.g., aws-n1)
-    const awsNodeName = 'aws-n1';
-
-    // Use regular expressions to extract the IP address associated with aws-n0
-    const regex = new RegExp(`Host\\s+${awsNodeName}[\\s\\S]*?HostName\\s+(\\S+)`);
-    const match = sshConfigFile.match(regex);
-
-    if (match && match[1]) {
-        const ipAddress = match[1];
-        const baseUrl = `http://${ipAddress}:3033/testnet3/block`;
-
-        console.log(`${dimStart}IP Address: ${ipAddress}${dimEnd}`);
-        console.log(`${dimStart}Base URL: ${baseUrl}${dimEnd}`);
-
-        // Fetch and output the specified block metric
-        fetchBlockMetrics(baseUrl, argv['metric-type']);
-    } else {
-        console.error(`No IP address found for ${awsNodeName} in ~/.ssh/config`);
-    }
+    // Fetch and output the specified block metric
+    fetchBlockMetrics(argv['metric-type'], argv['block-height']);
 }
 
 // Run the main function

.devnet/.analytics/package.json

@@ -4,8 +4,6 @@
   "description": "",
   "main": "analytics.js",
   "scripts": {
-    "averageBlockTime": "node analytics.js --metric-type averageBlockTime",
-    "roundsInBlocks": "node analytics.js --metric-type roundsInBlocks",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "The Aleo Team",

.devnet/README.md

@@ -6,11 +6,11 @@ Start by creating EC2 instances in the AWS console.
 - Ubuntu 22.04 LTS (not Amazon Linux)
 - Security Group - Inbound Policy
   - SSH - Port 22 - 0.0.0.0/0 (or your IP)
-  - Custom TCP - Port 3033 - 0.0.0.0/0 (or your IP)
-  - Custom TCP - Port 4133 - 0.0.0.0/0
+  - Custom TCP - Port 3030 - 0.0.0.0/0 (or your IP)
+  - Custom TCP - Port 4130 - 0.0.0.0/0
   - Custom TCP - Port 5000 - 0.0.0.0/0
 
-Be sure the give the EC2 instances a name tag, i.e. `testnet3`.
+Be sure the give the EC2 instances a name tag, i.e. `devnet`.
 
 Make sure you set the correct SSH `.pem` and have the `.pem` in your `~/.ssh` directory.