Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/iexec/blockchain/chain/IexecHubService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())) {
Expand Down