added new env with challengeExpire long value

Author: luistduarte

src/main/java/runHyperties/StartJavaHyperties.java

@@ -117,6 +117,19 @@ public void start() throws Exception {
 			e.printStackTrace();
 		}
 		System.out.println("SIOT_POC:" + pointOfContact);
+		
+		String challengeExpireStr = "1577750400000"; //31-12-2019
+		long challengeExpire = Long.valueOf(challengeExpireStr);
+		try {
+			String envChallengeExpire = System.getenv("CHALLENGE_EXPIRE");
+			if (envChallengeExpire != null) {
+				challengeExpire = Long.valueOf(envChallengeExpire);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		
+		
 
 		String checkINHypertyURL = "hyperty://sharing-cities-dsm/checkin-rating";
 		String userActivityHypertyURL = "hyperty://sharing-cities-dsm/user-activity";
@@ -380,6 +393,7 @@ public void start() throws Exception {
 		configWalletManager.put("rankingTimer", 30000);
 		configWalletManager.put("onReadMaxTransactions", 100);
 		configWalletManager.put("engageRating", 50);
+		configWalletManager.put("challengeExpire", challengeExpire);
 
 
 		// public wallets

src/main/java/walletManager/WalletManagerHyperty.java

@@ -62,6 +62,7 @@ public class WalletManagerHyperty extends AbstractHyperty {
 	private static final int initialBalance = 50;
 
 	private static int engageRating;
+	private static long challengeExpire;
 
 	@Override
 	public void start() {
@@ -75,6 +76,8 @@ public void start() {
 		int rankingTimer = config().getInteger("rankingTimer");
 		onReadMaxTransactions = config().getInteger("onReadMaxTransactions");
 		engageRating = config().getInteger("engageRating");
+		challengeExpire = config().getLong("challengeExpire");
+		
 
 		if (publicWallets != null) {
 			createPublicWallets(publicWallets);
@@ -1305,12 +1308,20 @@ private void validateTransaction(JsonObject transaction, String walletAddress) {
 				Future<Void> updatedTransaction = transferToPrivateWallet(walletAddress, transaction);
 
 				updatedTransaction.setHandler(asyncResult -> {
-					String publicWalletAddress = wallet.getString(causeWalletAddress);
-					if (publicWalletAddress != null) {
-						// update wallet2bGranted balance
-						transferToPublicWallet(publicWalletAddress, transaction);
+					
+					
+					Long currentTime = new Date().getTime();
+					logger.debug(" current:" + currentTime +"\n challengeExpire:"+challengeExpire);
+					if(currentTime < challengeExpire) {
+						String publicWalletAddress = wallet.getString(causeWalletAddress);
+						if (publicWalletAddress != null) {
+							// update wallet2bGranted balance
+							transferToPublicWallet(publicWalletAddress, transaction);
+						}
+					} else {
+						logger.debug("challengeExpire");
 					}
-
+					
 				});
 
 				// check if nonce is repeated