[Tracking] Pre-release of the mainnet branch

.circleci/config.yml

@@ -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.
 

.devnet/analytics.sh

@@ -16,16 +16,30 @@ fi
 
 # Prompt the user to select a metric type
 PS3="Select a metric type: "
-options=("Average Block Time" "Rounds in Blocks" "Quit")
+options=("Average Block Time" "Rounds in Blocks" "Check Block Hash" "Quit")
 select opt in "${options[@]}"
 do
   case $opt in
     "Average Block Time")
-      npm run averageBlockTime
+      echo ""
+      node analytics.js --metric-type averageBlockTime
       break
       ;;
     "Rounds in Blocks")
-      npm run roundsInBlocks
+      echo ""
+      node analytics.js --metric-type roundsInBlocks
+      break
+      ;;
+    "Check Block Hash")
+      echo "You selected 'Check Block Hash'. Please enter the block height:"
+      read blockHeight
+      echo ""
+      # Validate input is an integer
+      if ! [[ "$blockHeight" =~ ^[0-9]+$ ]]; then
+        echo "Error: Block height must be a positive integer."
+        exit 1
+      fi
+      node analytics.js --metric-type checkBlockHash --block-height "$blockHeight"
       break
       ;;
     "Quit")

.devnet/clean.sh

@@ -38,7 +38,7 @@ EOF
 }
 
 # Loop through aws-n nodes and terminate tmux sessions in parallel
-for NODE_ID in $(seq 0 $NUM_INSTANCES); do
+for NODE_ID in $(seq 0 $(($NUM_INSTANCES - 1))); do
   terminate_tmux_session $NODE_ID &
 done
 

.devnet/config.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Read the EC2 instance name from the user
-read -p "Enter the EC2 instance name to filter by (e.g. Name) (default: testnet3): " INSTANCE_NAME
-INSTANCE_NAME="${INSTANCE_NAME:-testnet3}"
+read -p "Enter the EC2 instance name to filter by (e.g. Name) (default: devnet): " INSTANCE_NAME
+INSTANCE_NAME="${INSTANCE_NAME:-devnet}"
 
 # Read the PEM file path from the user or use the default in ~/.ssh
-read -p "Enter the PEM file path (default: ~/.ssh/s3-testnet3.pem): " PEM_FILE
-PEM_FILE="${PEM_FILE:-~/.ssh/s3-testnet3.pem}"
+read -p "Enter the PEM file path (default: ~/.ssh/s3-devnet.pem): " PEM_FILE
+PEM_FILE="${PEM_FILE:-~/.ssh/s3-devnet.pem}"
 
 # Use the AWS CLI to describe running EC2 instances, filter by the provided name, and store the JSON output in a variable
 instance_info=$(aws ec2 describe-instances \

.devnet/install.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Prompt the user for the branch to install (default is "testnet3")
-read -p "Enter the branch to install (default: testnet3): " BRANCH
-BRANCH=${BRANCH:-testnet3}
+# Prompt the user for the branch to install (default is "mainnet")
+read -p "Enter the branch to install (default: mainnet): " BRANCH
+BRANCH=${BRANCH:-mainnet}
 
 # Determine the number of AWS EC2 instances by checking ~/.ssh/config
 NODE_ID=0
@@ -50,7 +50,7 @@ EOF
 }
 
 # Loop through aws-n nodes and run installations in parallel
-for NODE_ID in $(seq 0 $NUM_INSTANCES); do
+for NODE_ID in $(seq 0 $(($NUM_INSTANCES - 1))); do
   run_installation $NODE_ID $BRANCH &
 done
 

.devnet/reinstall.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Prompt the user for the branch to install (default is "testnet3")
-read -p "Enter the branch to install (default: testnet3): " BRANCH
-BRANCH=${BRANCH:-testnet3}
+# Prompt the user for the branch to install (default is "mainnet")
+read -p "Enter the branch to install (default: mainnet): " BRANCH
+BRANCH=${BRANCH:-mainnet}
 
 # Determine the number of AWS EC2 instances by checking ~/.ssh/config
 NODE_ID=0
@@ -54,7 +54,7 @@ EOF
 }
 
 # Loop through aws-n nodes and run installations in parallel
-for NODE_ID in $(seq 0 $NUM_INSTANCES); do
+for NODE_ID in $(seq 0 $(($NUM_INSTANCES - 1))); do
   run_installation $NODE_ID $BRANCH &
 done
 

.devnet/start.sh

@@ -37,7 +37,7 @@ start_snarkos_in_tmux() {
     tmux new-session -d -s snarkos-session
 
     # Send the snarkOS start command to the tmux session with the NODE_ID
-    tmux send-keys -t "snarkos-session" "snarkos start --nodisplay --bft 0.0.0.0:5000 --rest 0.0.0.0:3033 --peers $NODE_IP:4133 --validators $NODE_IP:5000 --verbosity $VERBOSITY --dev $NODE_ID --dev-num-validators $NUM_INSTANCES --validator --metrics" C-m
+    tmux send-keys -t "snarkos-session" "snarkos start --nodisplay --bft 0.0.0.0:5000 --rest 0.0.0.0:3030 --peers $NODE_IP:4130 --validators $NODE_IP:5000 --rest-rps 1000 --verbosity $VERBOSITY --dev $NODE_ID --dev-num-validators $NUM_INSTANCES --validator --metrics" C-m
 
     exit  # Exit root user
 EOF
@@ -51,7 +51,7 @@ EOF
 }
 
 # Loop through aws-n nodes and start snarkOS in tmux sessions in parallel
-for NODE_ID in $(seq 0 $NUM_INSTANCES); do
+for NODE_ID in $(seq 0 $(($NUM_INSTANCES - 1))); do
   start_snarkos_in_tmux $NODE_ID "$NODE_0_IP" &
 done
 

.devnet/stop.sh

@@ -34,7 +34,7 @@ EOF
 }
 
 # Loop through aws-n nodes and terminate tmux sessions in parallel
-for NODE_ID in $(seq 0 $NUM_INSTANCES); do
+for NODE_ID in $(seq 0 $(($NUM_INSTANCES - 1))); do
   terminate_tmux_session $NODE_ID &
 done
 

.github/dependabot.yml

@@ -5,5 +5,5 @@ updates:
   schedule:
     interval: daily
     time: "10:00"
-  target-branch: "testnet3"
+  target-branch: "mainnet"
   open-pull-requests-limit: 10

.github/workflows/release.yml

@@ -35,16 +35,16 @@ jobs:
           mkdir tempdir
           mv target/release/snarkos tempdir
           cd tempdir
-          zip -r aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip snarkos
+          zip -r aleo-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip snarkos
           cd ..
-          mv tempdir/aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip .
+          mv tempdir/aleo-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip .
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip
+            aleo-${{ steps.get_version.outputs.version }}-x86_64-unknown-linux-gnu.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -75,16 +75,16 @@ jobs:
           mkdir tempdir
           mv target/release/snarkos tempdir
           cd tempdir
-          zip -r aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip snarkos
+          zip -r aleo-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip snarkos
           cd ..
-          mv tempdir/aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip .
+          mv tempdir/aleo-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip .
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip
+            aleo-${{ steps.get_version.outputs.version }}-x86_64-apple-darwin.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -122,13 +122,13 @@ jobs:
 
       - name: Zip
         run: |
-          Compress-Archive target/release/snarkos.exe aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
+          Compress-Archive target/release/snarkos.exe aleo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
 
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            aleo-testnet1-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
+            aleo-${{ steps.get_version.outputs.version }}-x86_64-pc-windows-msvc.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.integration/src/lib.rs

@@ -23,13 +23,13 @@ mod tests {
         store::helpers::memory::ConsensusMemory,
         FromBytes,
         Ledger,
+        MainnetV0,
         Network,
-        Testnet3,
     };
 
     use tracing_test::traced_test;
 
-    type CurrentNetwork = Testnet3;
+    type CurrentNetwork = MainnetV0;
 
     const TEST_BASE_URL: &str = "https://testnet3.blocks.aleo.org/phase3";