diff --git a/gradle.properties b/gradle.properties index 8ede392d..8bd0681c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -releaseVersion=0.8.0-rc8.4 -besuVersion=24.12-delivery41 -arithmetizationVersion=0.8.0-rc8 +releaseVersion=1.2.0-rc0 +besuVersion=25.1-delivery42 +arithmetizationVersion=beta-v1.2.0-rc0 besuArtifactGroup=io.consensys.linea-besu distributionIdentifier=linea-sequencer distributionBaseUrl=https://artifacts.consensys.net/public/linea-besu/raw/names/linea-besu.tar.gz/versions/ \ No newline at end of file diff --git a/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java b/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java index e7ad2256..e6d1f2d8 100644 --- a/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java +++ b/sequencer/src/main/java/net/consensys/linea/rpc/methods/LineaEstimateGas.java @@ -44,7 +44,7 @@ import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.crypto.params.ECDomainParameters; import org.hyperledger.besu.crypto.SECPSignature; -import org.hyperledger.besu.datatypes.AccountOverrideMap; +import org.hyperledger.besu.datatypes.StateOverrideMap; import org.hyperledger.besu.datatypes.Wei; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters; import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException; @@ -149,7 +149,7 @@ public LineaEstimateGas.Response execute(final PluginRpcRequest request) { } final var callParameters = parseCallParameters(request.getParams()); - final var maybeStateOverrides = getAddressAccountOverrideMap(request.getParams()); + final var maybeStateOverrides = getStateOverrideMap(request.getParams()); final var minGasPrice = besuConfiguration.getMinGasPrice(); final var gasLimitUpperBound = calculateGasLimitUpperBound(callParameters, logId); final Wei baseFee = @@ -268,7 +268,7 @@ private Wei getEstimatedPriorityFee( private Long estimateGasUsed( final JsonCallParameter callParameters, - final Optional maybeStateOverrides, + final Optional maybeStateOverrides, final Transaction transaction, final Wei baseFee, final long logId) { @@ -444,9 +444,9 @@ private void validateCallParameters(final JsonCallParameter callParameters) { } } - protected Optional getAddressAccountOverrideMap(final Object[] params) { + protected Optional getStateOverrideMap(final Object[] params) { try { - return parameterParser.optional(params, 1, AccountOverrideMap.class); + return parameterParser.optional(params, 1, StateOverrideMap.class); } catch (JsonRpcParameter.JsonRpcParameterException e) { throw new InvalidJsonRpcRequestException( "Invalid account overrides parameter (index 1)", RpcErrorType.INVALID_CALL_PARAMS, e);