From 76219f941308db493a7ca56c9e286412284d96a2 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Tue, 16 Dec 2025 10:26:32 +0100 Subject: [PATCH] fix: call new hasEnoughGas method to fall back on cached value on communication failure --- docker-compose.yml | 2 +- gradle.properties | 2 +- .../java/com/iexec/blockchain/chain/IexecHubService.java | 4 ---- .../task/initialize/TaskInitializeBlockchainService.java | 6 +++--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 290a202..07c9218 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: ibaa-chain: - image: docker-regis.iex.ec/poco-chain:1.1.0-poco-v6.1.0-contracts-voucher-v1.0.0-nethermind + image: docker-regis.iex.ec/poco-chain:1.2.2-poco-v6.2.0-contracts-nethermind expose: - "8545" diff --git a/gradle.properties b/gradle.properties index bc268b1..fbf2426 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # x-release-please-start-version version=9.0.4 # x-release-please-end -iexecCommonsPocoVersion=5.3.1 +iexecCommonsPocoVersion=5.4.0 iexecCommonVersion=9.2.0 nexusUser diff --git a/src/main/java/com/iexec/blockchain/chain/IexecHubService.java b/src/main/java/com/iexec/blockchain/chain/IexecHubService.java index f2b5da7..ab3b6f7 100644 --- a/src/main/java/com/iexec/blockchain/chain/IexecHubService.java +++ b/src/main/java/com/iexec/blockchain/chain/IexecHubService.java @@ -139,10 +139,6 @@ public TransactionReceipt waitForTxMined(final SubmittedTx submittedTx) throws I return receipt; } - public boolean hasEnoughGas() { - return hasEnoughGas(credentials.getAddress()); - } - /** * Check if the task is defined on-chain and has the {@link ChainTaskStatus#UNSET} status. * diff --git a/src/main/java/com/iexec/blockchain/command/task/initialize/TaskInitializeBlockchainService.java b/src/main/java/com/iexec/blockchain/command/task/initialize/TaskInitializeBlockchainService.java index 9948078..395921a 100644 --- a/src/main/java/com/iexec/blockchain/command/task/initialize/TaskInitializeBlockchainService.java +++ b/src/main/java/com/iexec/blockchain/command/task/initialize/TaskInitializeBlockchainService.java @@ -37,13 +37,13 @@ public TaskInitializeBlockchainService(final IexecHubService iexecHubService) { @Override public boolean canSendBlockchainCommand(final TaskInitializeArgs args) { - String chainTaskId = args.getChainTaskId(); + final String chainTaskId = args.getChainTaskId(); if (!iexecHubService.hasEnoughGas()) { - logError(chainTaskId, args, "task is not revealing"); + logError(chainTaskId, args, "insufficient gas"); return false; } if (!iexecHubService.isTaskInUnsetStatusOnChain(args.getChainTaskId())) { - logError(chainTaskId, args, "task is not unset"); + logError(chainTaskId, args, "task already exist on-chain"); return false; } if (!iexecHubService.isBeforeContributionDeadline(args.getChainDealId())) {