Merge pull request #172 from iExecBlockchainComputing/check-status-after-tx

Check status after tx

Author: james-toussaint

src/main/java/com/iexec/worker/chain/IexecHubService.java

@@ -98,10 +98,9 @@ private IexecHubABILegacy.TaskContributeEventResponse sendContributeTransaction(
         }
 
         if (contributeEvent != null && contributeEvent.log != null &&
-                (!contributeEvent.log.getType().equals(PENDING_RECEIPT_STATUS)
-                        || isStatusValidOnChainAfterPendingReceipt(chainTaskId, CONTRIBUTED, this::isContributionStatusValidOnChain))) {
-            log.info("Contributed [chainTaskId:{}, resultHash:{}, gasUsed:{}]",
-                    chainTaskId, resultHash, contributeReceipt.getGasUsed());
+                isStatusValidOnChainAfterPendingReceipt(chainTaskId, CONTRIBUTED, this::isContributionStatusValidOnChain)) {
+            log.info("Contributed [chainTaskId:{}, resultHash:{}, gasUsed:{}, log:{}]",
+                    chainTaskId, resultHash, contributeReceipt.getGasUsed(), contributeEvent.log);
             return contributeEvent;
         }
 
@@ -144,10 +143,9 @@ private IexecHubABILegacy.TaskRevealEventResponse sendRevealTransaction(String c
         }
 
         if (revealEvent != null && revealEvent.log != null &&
-                (!revealEvent.log.getType().equals(PENDING_RECEIPT_STATUS)
-                        || isStatusValidOnChainAfterPendingReceipt(chainTaskId, REVEALED, this::isContributionStatusValidOnChain))) {
-            log.info("Revealed [chainTaskId:{}, resultDigest:{}, gasUsed:{}]",
-                    chainTaskId, resultDigest, revealReceipt.getGasUsed());
+                isStatusValidOnChainAfterPendingReceipt(chainTaskId, REVEALED, this::isContributionStatusValidOnChain)) {
+            log.info("Revealed [chainTaskId:{}, resultDigest:{}, gasUsed:{}, log:{}]",
+                    chainTaskId, resultDigest, revealReceipt.getGasUsed(), revealEvent.log);
             return revealEvent;
         }
 

src/main/resources/application.yml

@@ -8,7 +8,7 @@ core:
 worker:
   name: ${IEXEC_WORKER_NAME:customWorker}
   workerBaseDir: ${IEXEC_WORKER_BASE_DIR:/tmp/iexec-worker}
-  gasPriceMultiplier: ${IEXEC_GAS_PRICE_MULTIPLIER:1.0} # txs will be send with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
+  gasPriceMultiplier: ${IEXEC_GAS_PRICE_MULTIPLIER:1.3} # txs will be send with networkGasPrice*gasPriceMultiplier, 4.0 means super fast
   gasPriceCap: ${IEXEC_GAS_PRICE_CAP:22000000000} #in Wei, will be used for txs if networkGasPrice*gasPriceMultiplier > gasPriceCap
   teeEnabled: ${IEXEC_TEE_ENABLED:false}
   overrideBlockchainNodeAddress: ${IEXEC_WORKER_OVERRIDE_BLOCKCHAIN_NODE_ADDRESS:} #will use it if set, else will use the one given by the core