Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cannotUseMoreThanChildContractLimit test #9707

Merged
merged 11 commits into from
Nov 10, 2023
Merged

Fix cannotUseMoreThanChildContractLimit test #9707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b57c563
Fix hapiNftIsApprovedForAll test
MiroslavGatsanoga Nov 1, 2023
cc75896
intermezzo
tinker-michaelj Nov 1, 2023
970fff8
Support both ERC redirect and classic isApprovedForAll()
tinker-michaelj Nov 1, 2023
208bb99
Fix htsTokenAllowance, hapiNftGetApproved, hapiNftIsApprovedForAll tests
thenswan Nov 2, 2023
7193cbb
Fixed remaining tests in ApproveAllowanceSuite
thenswan Nov 3, 2023
f8e97a0
Merge branch 'develop' into 09357-fix-approve-allowance-tests
thenswan Nov 3, 2023
392b1b8
Fixed tests.
thenswan Nov 3, 2023
a93c6c8
Fix unit test and spotless checks.
thenswan Nov 3, 2023
e583b76
Fix cannotUseMoreThanChildContractLimit test
MiroslavGatsanoga Nov 6, 2023
6672582
Merge branch 'develop' into 09124-fix-cannotUseMoreThanChildContractL…
MiroslavGatsanoga Nov 10, 2023
df9bdd6
Fix after merging develop
MiroslavGatsanoga Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ava/com/hedera/node/app/service/contract/impl/exec/systemcontracts/HtsSystemContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCall;
import com.hedera.node.app.service.contract.impl.exec.systemcontracts.hts.HtsCallFactory;
import com.hedera.node.app.service.contract.impl.exec.utils.FrameUtils;
import com.hedera.node.app.spi.workflows.HandleException;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.inject.Inject;
import javax.inject.Singleton;
Expand Down Expand Up @@ -69,6 +70,8 @@ private static FullResult resultOfExecuting(
final HtsCall.PricedResult pricedResult;
try {
pricedResult = call.execute(frame);
} catch (final HandleException handleException) {
throw handleException;
} catch (final Exception internal) {
log.error("Unhandled failure for input {} to HTS system contract", input, internal);
return haltResult(ExceptionalHaltReason.PRECOMPILE_ERROR, frame.getRemainingGas());
Expand Down
4 changes: 4 additions & 0 deletions .../main/java/com/hedera/node/app/service/contract/impl/hevm/HederaEvmTransactionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.hedera.hapi.node.base.ResponseCodeEnum.CONTRACT_REVERT_EXECUTED;
import static com.hedera.hapi.node.base.ResponseCodeEnum.INSUFFICIENT_GAS;
import static com.hedera.hapi.node.base.ResponseCodeEnum.INVALID_CONTRACT_ID;
import static com.hedera.hapi.node.base.ResponseCodeEnum.MAX_CHILD_RECORDS_EXCEEDED;
import static com.hedera.hapi.node.base.ResponseCodeEnum.MAX_CONTRACT_STORAGE_EXCEEDED;
import static com.hedera.hapi.node.base.ResponseCodeEnum.MAX_STORAGE_IN_PRICE_REGIME_HAS_BEEN_USED;
import static com.hedera.hapi.node.base.ResponseCodeEnum.SUCCESS;
Expand Down Expand Up @@ -73,6 +74,7 @@ public record HederaEvmTransactionResult(
Bytes.wrap(MAX_STORAGE_IN_PRICE_REGIME_HAS_BEEN_USED.name());
private static final Bytes INSUFFICIENT_GAS_REASON = Bytes.wrap(INSUFFICIENT_GAS.name());
private static final Bytes INVALID_CONTRACT_REASON = Bytes.wrap(INVALID_CONTRACT_ID.name());
private static final Bytes MAX_CHILD_RECORDS_EXCEEDED_REASON = Bytes.wrap(MAX_CHILD_RECORDS_EXCEEDED.name());

/**
* Converts this result to a {@link ContractFunctionResult} for a transaction based on the given
Expand Down Expand Up @@ -137,6 +139,8 @@ public ResponseCodeEnum finalStatus() {
return INSUFFICIENT_GAS;
} else if (revertReason.equals(INVALID_CONTRACT_REASON)) {
return INVALID_CONTRACT_ID;
} else if (revertReason.equals(MAX_CHILD_RECORDS_EXCEEDED_REASON)) {
return MAX_CHILD_RECORDS_EXCEEDED;
} else {
return CONTRACT_REVERT_EXECUTED;
}
Expand Down
1 change: 1 addition & 0 deletions ...ients/src/main/java/com/hedera/services/bdd/suites/contract/hapi/ContractDeleteSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public List<HapiSpec> getSpecsInSuite() {
cannotUseMoreThanChildContractLimit());
}

@HapiTest
private HapiSpec cannotUseMoreThanChildContractLimit() {
final var illegalNumChildren =
HapiSpecSetup.getDefaultNodeProps().getInteger("consensus.handle.maxFollowingRecords") + 1;
Expand Down