From 0c309c5bcf12580b48a06956557d91112e91690b Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 21 Nov 2023 17:50:05 +0100 Subject: [PATCH 1/2] Fix Docker image name clash between Besu and evmtool Signed-off-by: Fabio Di Fabio --- ethereum/evmtool/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle index f92f6d3f937..9bc302f60c7 100644 --- a/ethereum/evmtool/build.gradle +++ b/ethereum/evmtool/build.gradle @@ -106,7 +106,7 @@ tasks.register('distDocker', Exec) { dependsOn dockerDistUntar def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger" - def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu-evmtool" + def dockerArtifactName = project.hasProperty("dockerArtifactName") ? "${project.getProperty("dockerArtifactName")}-evmtool" : "besu-evmtool" def imageName = "${dockerOrgName}/${dockerArtifactName}" def image = "${imageName}:${dockerBuildVersion}" @@ -128,7 +128,7 @@ tasks.register('dockerUpload', Exec) { dependsOn distDocker String dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}" def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger" - def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu-evmtool" + def dockerArtifactName = project.hasProperty("dockerArtifactName") ? "${project.getProperty("dockerArtifactName")}-evmtool" : "besu-evmtool" def imageName = "${dockerOrgName}/${dockerArtifactName}" def image = "${imageName}:${dockerBuildVersion}" def cmd = "docker push '${image}'" From 2682bc810f5a63996c55795fd2a203cf86924483 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 21 Nov 2023 18:15:54 +0100 Subject: [PATCH 2/2] Update CHANGELOG Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a4d3138d39..aa6962f5e11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ - Implement debug_traceCall [#5885](https://github.com/hyperledger/besu/pull/5885) - Transactions that takes too long to evaluate, during block creation, are dropped from the txpool [#6163](https://github.com/hyperledger/besu/pull/6163) - New option `tx-pool-min-gas-price` to set a lower bound when accepting txs to the pool [#6098](https://github.com/hyperledger/besu/pull/6098) -- Allow a transaction selection plugin to specify custom selection results [#6190](https://github.com/hyperledger/besu/pull/6190) +- Allow a transaction selection plugin to specify custom selection results [#6190](https://github.com/hyperledger/besu/pull/6190) - Add `rpc-gas-cap` to allow users to set gas limit to the RPC methods used to simulate transactions[#6156](https://github.com/hyperledger/besu/pull/6156) +### Bug fixes +- Fix Docker image name clash between Besu and evmtool [#6194](https://github.com/hyperledger/besu/pull/6194) ## 23.10.2