Fantom. Pre-merge review

Author: EC2 Default User

lib/fantom/README.md

@@ -299,7 +299,7 @@ pwd
 export INSTANCE_ID="i-**************"
 echo "INSTANCE_ID=" $INSTANCE_ID
 aws ssm start-session --target $INSTANCE_ID --region $AWS_REGION
-sudo cat /var/log/cloud-init-output.log
+sudo cat /var/log/user-data.log
 ```
 
 3. How can I restart the Fantom service?

lib/fantom/lib/assets/fantom-checker/syncchecker-fantom.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-#FANTOM_SYNC_STATS=$(curl -s -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"ftm_syncing","params":[],"id":1}' http://localhost:18545 | jq -r ".result")
-
 FANTOM_SYNC_STATS=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --datadir=/data --exec "ftm.syncing"')
 # Syncing status results:
 #
-# { currentBlock: 37676547,
-# currentBlockHash: "0x0001ab120000187fd8069d3a4f6501d48ad4800778f40a76d79cf02469272a43",
-# currentBlockTime: "0x16ec7a4b9a82ebfe",
-# currentEpoch: "0x1ab13",
-# highestBlock: 80196141,
-# highestEpoch: "0x44343",
-# knownStates: 0,
-# pulledStates: 0,
-# startingBlock: 0 }
+#{
+#  currentBlock: 37676547,
+#  currentBlockHash: "0x0001ab120000187fd8069d3a4f6501d48ad4800778f40a76d79cf02469272a43",
+#  currentBlockTime: "0x16ec7a4b9a82ebfe",
+#  currentEpoch: "0x1ab13",
+#  highestBlock: 82410549,
+#  highestEpoch: "0x45f22",
+#  knownStates: 0,
+#  pulledStates: 0,
+#  startingBlock: 0
+#}
 #
 # Synced status results:
 #
@@ -22,16 +22,15 @@ FANTOM_SYNC_STATS=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --dat
 # TODO: if a node falls behind, does it revert to syncing?
 
 # If false, then get current block number:
-if $FANTOM_SYNC_STATS != false; then
-
-FANTOM_SYNC_BLOCK=$(echo $FANTOM_SYNC_STATS | jq -r ".currentBlock")
-FANTOM_HIGHEST_BLOCK=$(echo $FANTOM_SYNC_STATS | jq -r ".highestBlock")
-
-FANTOM_BLOCKS_BEHIND="$((FANTOM_HIGHEST_BLOCK-FANTOM_SYNC_BLOCK))"
+if [ -n "$FANTOM_SYNC_STATS" ] && [ "$FANTOM_SYNC_STATS" != "false" ]; then
+    FANTOM_SYNC_BLOCK=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --datadir=/data --exec "ftm.syncing.currentBlock"')
+    FANTOM_HIGHEST_BLOCK=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --datadir=/data --exec "ftm.syncing.highestBlock"')
+    
+    FANTOM_BLOCKS_BEHIND="$((FANTOM_HIGHEST_BLOCK-FANTOM_SYNC_BLOCK))"
 
 else
-FANTOM_SYNC_BLOCK=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --datadir=/data --exec "ftm.blockNumber"')
-FANTOM_BLOCKS_BEHIND=0
+    FANTOM_SYNC_BLOCK=$(su bcuser -c '/home/bcuser/go-opera/build/opera attach --datadir=/data --exec "ftm.blockNumber"')
+    FANTOM_BLOCKS_BEHIND=0
 fi
 
 # Sending data to CloudWatch

lib/fantom/lib/assets/node-cw-dashboard.ts

@@ -221,7 +221,7 @@ export const SyncNodeCWDashboardJSON = {
             "type": "metric",
             "properties": {
                 "metrics": [
-                    [ "CWAgent", "disk_used_percent", "path", "/data", "InstanceId", "${INSTANCE_ID}", "device", "nvme1n1", "fstype", "ext4", { "region": "${REGION}", "label": "/data" } ]
+                    [ "CWAgent", "disk_used_percent", "path", "/data", "InstanceId", "${INSTANCE_ID}", "device", "nvme1n1", "fstype", "xfs", { "region": "${REGION}", "label": "/data" } ]
                 ],
                 "sparkline": true,
                 "view": "singleValue",

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

@@ -196,7 +196,7 @@ else
   echo "Data volume type is EBS"
 
   DATA_VOLUME_ID=/dev/$(lsblk -lnb | awk -v VOLUME_SIZE_BYTES="$DATA_VOLUME_SIZE" '{if ($4== VOLUME_SIZE_BYTES) {print $1}}')
-  mkfs -t ext4 $DATA_VOLUME_ID
+  sudo mkfs.xfs -f $DATA_VOLUME_ID
   sleep 10
   DATA_VOLUME_UUID=$(lsblk -fn -o UUID  $DATA_VOLUME_ID)
   DATA_VOLUME_FSTAB_CONF="UUID=$DATA_VOLUME_UUID /data ext4 defaults 0 2"

lib/fantom/sample-configs/.env-sample-read

@@ -7,11 +7,11 @@ AWS_ACCOUNT_ID="xxxxxxxxxxx"
 AWS_REGION="us-east-1"
 
 ## Optional FANTOM snapshots download link                                          # IMPORTANT !!! Make sure the url is valid before you use it!
-FANTOM_SNAPSHOTS_URI=https://snapshot.fantom.network/files/snapsync/latest/listtgzfiles.txt # Optional param. Do a full sync if not provided.
+FANTOM_SNAPSHOTS_URL=https://snapshot.fantom.network/files/snapsync/latest/listtgzfiles.txt # Optional param. Do a full sync if not provided.
 
 ## Common configuration parameters ##
 FANTOM_NETWORK="mainnet"                                                            # All options:  "mainnet", "testnet"
-FANTOM_NODE_CONFIGURATION="read"                                                    # All options:   "read", "api", "validator"
+FANTOM_NODE_CONFIGURATION="read"                                                    # All options:   "read". Options "api" and "validator" are not yet supported
 
 ## Instance Nodes
 FANTOM_INSTANCE_TYPE="i3en.xlarge"