Starknet. Final pre-commit scan done

Author: Nikolay

docs/pre-merge-tools.md

@@ -42,4 +42,4 @@ npm run install-pre-commit-mac
 npm run run-pre-commit
 ```
 
-4. Optionally, run [shellcheck](https://github.com/koalaman/shellcheck) to check for common problems in your shell scripts.
+4. Optionally, run [shellcheck](https://github.com/koalaman/shellcheck) to check for common problems in your shell scripts.

lib/starknet/.npmignore

@@ -8,4 +8,4 @@ node_modules
 cdk.out
 .idea
 
-*-node.json
+*-node.json

lib/starknet/README.md

@@ -151,7 +151,7 @@ A script on the Starknet node publishes current block and blocks behind metrics
 
    # Undeploy Single Node
    npx cdk destroy starknet-single-node
-   
+
    # Undeploy AMB Etheruem node
    npx cdk destroy starknet-ethereum-l1-node
 

lib/starknet/app.ts

@@ -27,7 +27,7 @@ new StarknetAMBEthereumSingleNodeStack(app, "starknet-ethereum-l1-node", {
 new StarknetSingleNodeStack(app, "starknet-single-node", {
   stackName: `starknet-single-node-${config.baseNodeConfig.starknetNetworkId}`,
   env: { account: config.baseConfig.accountId, region: config.baseConfig.region },
-  
+
   instanceType: config.baseNodeConfig.instanceType,
   instanceCpuType: config.baseNodeConfig.instanceCpuType,
   dataVolume: config.baseNodeConfig.dataVolume,
@@ -44,4 +44,4 @@ cdk.Aspects.of(app).add(
         reports: true,
         logIgnores: false,
     })
-);
+);

lib/starknet/lib/amb-ethereum-single-node-stack.ts

@@ -40,7 +40,7 @@ export class StarknetAMBEthereumSingleNodeStack extends cdk.Stack {
             value: ambEthereumNode.wssRpcUrlWithBillingToken,
             exportName: "AmbEthereumNodeRpcUrlWithBillingToken",
         });
-        
+
         // Adding suppressions to the stack
         nag.NagSuppressions.addResourceSuppressions(
             this,

lib/starknet/lib/assets/restore-from-snapshot.sh

@@ -46,6 +46,7 @@ tar -xvf  $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME -C /data 2>&1 | tee unzip.log && ech
 
 echo "Decompresed snapshot, cleaning up..."
 
+rm -f /data/juno
 mv /data/juno_$STARKNET_NETWORK_ID /data/juno && \
 rm -rf $SNAPSHOT_DIR/$SNAPSHOT_FILE_NAME
 
@@ -54,4 +55,4 @@ echo "Snapshot is ready, starting the service.."
 chown -R ubuntu:ubuntu /data
 
 sudo systemctl daemon-reload
-sudo systemctl enable --now starknet
+sudo systemctl enable --now starknet

lib/starknet/lib/assets/setup-instance-store-volumes.sh

@@ -34,4 +34,4 @@ if [ -n "$DATA_VOLUME_ID" ]; then
   else
     echo "Data volume is mounted, nothing changed"
   fi
-fi
+fi

lib/starknet/lib/assets/sync-checker/syncchecker-starknet.sh

@@ -7,21 +7,19 @@ EC2_INTERNAL_IP=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -s "http://169.254.
 STARKNET_SYNC_STATS=$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"starknet_syncing","params":[],"id":1}' http://$EC2_INTERNAL_IP:6060 | jq -r ".result")
 
 if [[ "$STARKNET_SYNC_STATS" == "false" ]]; then
-    echo "Node is fully synced. No syncing data available."
-    exit 0
+    STARKNET_CURRENT_BLOCK=$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"starknet_blockNumber","params":[],"id":1}' http://$EC2_INTERNAL_IP:6060 | jq -r ".result")
+    STARKNET_HIGHEST_BLOCK=$STARKNET_CURRENT_BLOCK
 else
     # Extract current and highest block numbers from the syncing status
     STARKNET_CURRENT_BLOCK=$(echo "$STARKNET_SYNC_STATS" | jq -r ".current_block_num")
     STARKNET_HIGHEST_BLOCK=$(echo "$STARKNET_SYNC_STATS" | jq -r ".highest_block_num")
-
-    # Echo the current and highest block numbers for verification
-    echo "Current Block: $STARKNET_CURRENT_BLOCK"
-    echo "Highest Block: $STARKNET_HIGHEST_BLOCK"
 fi
 
 STARKNET_BLOCKS_BEHIND="$((STARKNET_HIGHEST_BLOCK-STARKNET_CURRENT_BLOCK))"
-
-    echo "STARKNET_BLOCKS_BEHIND Block: $STARKNET_BLOCKS_BEHIND"
+# Echo the current and highest block numbers for verification
+echo "Current Block: $STARKNET_CURRENT_BLOCK"
+echo "Highest Block: $STARKNET_HIGHEST_BLOCK"
+echo "STARKNET_BLOCKS_BEHIND Block: $STARKNET_BLOCKS_BEHIND"
 
 # Sending data to CloudWatch
 INSTANCE_ID=$(curl -H "X-aws-ec2-metadata-token: $TOKEN" -s http://169.254.169.254/latest/meta-data/instance-id)

lib/starknet/lib/assets/user-data/node.sh

@@ -109,7 +109,13 @@ else
 fi
 
 mkfs -t ext4 $DATA_VOLUME_ID
-sleep 10
+echo "waiting for volume to get UUID"
+  OUTPUT=0;
+  while [ "$OUTPUT" = 0 ]; do
+    DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
+    OUTPUT=$(echo $DATA_VOLUME_UUID | grep -c - $2)
+    echo $OUTPUT
+  done
 DATA_VOLUME_UUID=$(lsblk -fn -o UUID $DATA_VOLUME_ID)
 DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data ext4 defaults 0 2"
 echo "DATA_VOLUME_ID="$DATA_VOLUME_ID
@@ -208,5 +214,5 @@ sudo mv /opt/sync-checker/syncchecker-starknet.sh /opt/syncchecker.sh
 sudo chmod +x /opt/syncchecker.sh
 
 echo "*/5 * * * * /opt/syncchecker.sh" | crontab
-crontab -l 
-echo "All done!"
+crontab -l
+echo "All done!"

lib/starknet/lib/config/starknetConfig.ts

@@ -23,7 +23,7 @@ export const baseConfig: configTypes.StarknetBaseConfig = {
     region: process.env.AWS_REGION || "us-east-1",
 }
 
-export const baseNodeConfig: configTypes.StarknetBaseNodeConfig = {    
+export const baseNodeConfig: configTypes.StarknetBaseNodeConfig = {
     ambEntereumNodeNetworkId: <configTypes.AMBEthereumNodeNetworkId> process.env.AMB_ENTEREUM_NODE_NETWORK_ID || "mainnet",
     ambEntereumNodeInstanceType: process.env.AMB_ETHEREUM_NODE_INSTANCE_TYPE || "bc.m5.xlarge",
     instanceType: new ec2.InstanceType(process.env.STARKNET_INSTANCE_TYPE ? process.env.STARKNET_INSTANCE_TYPE : "m6a.2xlarge"),