From eaba024b83d8786b4b5ef82516155d12aab28e2a Mon Sep 17 00:00:00 2001 From: Luis Pinto Date: Fri, 20 Dec 2024 11:29:35 +0000 Subject: [PATCH] make gradle dependency verification on verkle lenient Signed-off-by: Luis Pinto --- .../main/java/org/hyperledger/besu/datatypes/AccessWitness.java | 1 + .../java/org/hyperledger/besu/ethereum/chain/GenesisState.java | 2 +- gradle.properties | 2 +- plugin-api/build.gradle | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccessWitness.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccessWitness.java index c8f8fca491a..2180eece915 100644 --- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccessWitness.java +++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccessWitness.java @@ -84,6 +84,7 @@ long touchAndChargeValueTransferSelfDestruct( * in the account. * * @param address where the contract is being deployed + * @param codeLength total size of the contract's code * @return stateless costs associated with accesses */ long touchCodeChunksUponContractCreation(Address address, long codeLength); diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java index fdb4f949c22..55aeff9c374 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java @@ -333,7 +333,7 @@ private static boolean isOsakaAtGenesis(final GenesisConfig genesis) { return isVerkleAtGenesis(genesis); } - private static boolean isVerkleAtGenesis(final GenesisConfigFile genesis) { + private static boolean isVerkleAtGenesis(final GenesisConfig genesis) { final OptionalLong verkleTimestamp = genesis.getConfigOptions().getVerkleTime(); if (verkleTimestamp.isPresent()) { return genesis.getTimestamp() >= verkleTimestamp.getAsLong(); diff --git a/gradle.properties b/gradle.properties index 8a4f06d6d46..2d386b2fdd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.welcome=never # versionappendcommit=true # Optional, skip dependency verification for dev/debug builds -# org.gradle.dependency.verification=lenient +org.gradle.dependency.verification=lenient # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396) diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle index 070313150eb..8ed11696c4c 100644 --- a/plugin-api/build.gradle +++ b/plugin-api/build.gradle @@ -71,7 +71,7 @@ Calculated : ${currentHash} tasks.register('checkAPIChanges', FileStateChecker) { description = "Checks that the API for the Plugin-API project does not change without deliberate thought" files = sourceSets.main.allJava.files - knownHash = '+YR9PYN+gPCvXzK2w52ypz9dZ0FOy0G3I1PljZasOkU=' + knownHash = 'iXB9eWeTq1e/uWXSb2dNTa7yL1BCunZ2doLC26y6VrA=' } check.dependsOn('checkAPIChanges')