adapt passed for time for QA env

Author: NathanBSC

.env

@@ -6,7 +6,7 @@ INIT_HOLDER="0x04d63aBCd2b9b1baa327f2Dda0f873F197ccd186"
 INIT_HOLDER_PRV="59ba8068eb256d520179e903f43dacf6d8d57d72bd306e1bd603fdb8c8da10e8"
 RPC_URL="http://127.0.0.1:8545"
 PASSED_FORK_DELAY=200
-LAST_FORK_MORE_DELAY=10
+LAST_FORK_MORE_DELAY=1800
 FullImmutabilityThreshold=512
 MinBlocksForBlobRequests=576
 DefaultExtraReserveForBlobRequests=32

qa-env-resource/chaind.sh

@@ -11,8 +11,8 @@ FixedTurnLength=1
 function startChaind() {
     workspace=/server/validator
 
-    HardforkTime=`cat ${workspace}/hardforkTime.txt|grep hardforkTime|awk -F" " '{print $NF}'`
-    BohrHardforkTime=`expr ${HardforkTime} + 10`
+    PassedForkTime=`cat ${workspace}/hardforkTime.txt|grep passedHardforkTime|awk -F" " '{print $NF}'`
+    LastHardforkTime=$(expr ${PassedForkTime} + ${LAST_FORK_MORE_DELAY})
     initLog=${workspace}/init.log
     rialtoHash=`cat ${initLog}|grep "database=lightchaindata"|awk -F"=" '{print $NF}'|awk -F'"' '{print $1}'`
 
@@ -29,7 +29,7 @@ function startChaind() {
         --pprof --pprof.port 6061 \
         --syncmode snap --mine --vote --monitor.maliciousvote \
         --cache 10480 --light.serve 50 \
-        --rialtohash ${rialtoHash} --override.bohr ${BohrHardforkTime} \
+        --rialtohash ${rialtoHash} --override.passedforktime ${PassedForkTime} --override.bohr ${LastHardforkTime} \
         --override.immutabilitythreshold ${FullImmutabilityThreshold} --override.breatheblockinterval ${BreatheBlockInterval} \
         --override.minforblobrequest ${MinBlocksForBlobRequests} --override.defaultextrareserve ${DefaultExtraReserveForBlobRequests} \
 #        --override.fixedturnlength ${FixedTurnLength} \