Skip to content

Commit 954828e

Browse files
macfarlajfloGabriel-Trintinaliamatktfab-10
authored
Disable fast sync actions test (#9)
* fixes syntax errors (hyperledger#8164) Signed-off-by: jflo <justin+github@florentine.us> * Pectra testnet fork slots (hyperledger#8163) * adds Prague slot times Signed-off-by: jflo <justin+github@florentine.us> --------- Signed-off-by: jflo <justin+github@florentine.us> * Check if discovery service is running before `admin_addPeer` (hyperledger#8160) Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> * update eth_call error message (hyperledger#8129) Signed-off-by: Karim Taam <karim.t2am@gmail.com> * Refactor the methods for getting mutable states in the WorldState provider (hyperledger#8113) Refactor the methods for retrieving mutable states in the WorldState provider and make additional improvements to clean up the code. --------- Signed-off-by: Karim Taam <karim.t2am@gmail.com> * Extend simulate transaction on pending block plugin API (hyperledger#8174) Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * debug_traceBlock use existing block header instead of hash (hyperledger#8184) This means you don't need to have the block already in the chain when you call debug_traceBlock with a block's RLP (you just need the parent). Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * fixes warning on sonar analysis (hyperledger#8193) Signed-off-by: jflo <justin+github@florentine.us> * add spotless to PR checklist (hyperledger#8185) Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Reuse constant INVALID_PARAMS_ERROR_CODE for RpcErrorType.java (hyperledger#8154) Magic number "-32602" has been defined in the super interface, so reusing that constant value. Signed-off-by: Andrew Cheng <andrewcheng1997@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> * Improve BLOCKHASH Short Circuit (hyperledger#8171) * Improve BLOCKHASH Short Circuit Signed-off-by: Danno Ferrin <danno@numisight.com> Co-authored-by: Justin Florentine <justin+github@florentine.us> * TransactionResult: add v for blob and pending tx (hyperledger#8196) * add v for blob and pending tx Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * add v for blob and pending tx in tests Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * add v for blob tx in test Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> * Prague t8n and referenceTests fixes for EEST (hyperledger#8167) Fix referenceTests bug with fallback EMPTY Address. T8n support for excessBlobGas for both state tests and blockchain test. State tests should use the given excessBlobGas rather than computing from the parent header. Signed-off-by: Simon Dudley <simon.dudley@consensys.net> * disable fast sync actions test Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: jflo <justin+github@florentine.us> Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Simon Dudley <simon.dudley@consensys.net> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: Andrew Cheng <andrewcheng1997@gmail.com> Co-authored-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net> Co-authored-by: Karim Taam <karim.t2am@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net> Co-authored-by: Simon Dudley <simon.dudley@consensys.net> Co-authored-by: Andrew Cheng <andrewcheng1997@gmail.com> Co-authored-by: Danno Ferrin <danno@numisight.com>
1 parent be33889 commit 954828e

File tree

154 files changed

+1241
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1241
-635
lines changed

‎.github/pull_request_template.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
### Locally, you can run these tests to catch failures early:
1616

17+
- [ ] spotless: `./gradlew spotlessApply`
1718
- [ ] unit tests: `./gradlew build`
1819
- [ ] acceptance tests: `./gradlew acceptanceTest`
1920
- [ ] integration tests: `./gradlew integrationTest`

‎.github/workflows/sonarcloud.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ jobs:
1717
steps:
1818
- name: checkout
1919
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
20+
with:
21+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2022
- name: Set up Java
2123
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
2224
with:

‎.github/workflows/verify_artifacts.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def create_artifact_paths(version):
2525
# besu/internal/config
2626
f"{artifacts_base_path}/internal/config/{version}/config-{version}.module",
2727
f"{artifacts_base_path}/internal/config/{version}/config-{version}.pom",
28-
f"{artifacts_base_path}/internal/config/{version}/config-{version}.jar"
28+
f"{artifacts_base_path}/internal/config/{version}/config-{version}.jar",
2929
# bom
3030
f"{artifacts_base_path}/bom/{version}/bom-{version}.module",
3131
f"{artifacts_base_path}/bom/{version}/bom-{version}.pom",
@@ -42,11 +42,11 @@ def check_url(url):
4242

4343
def main():
4444
parser = argparse.ArgumentParser(description='Check besu artifacts')
45-
parser.add_argument('--besu_{version}', action="store", dest='besu_{version}', default="")
45+
parser.add_argument('--besu_version', action="store", dest='besu_version', default="")
4646
args = parser.parse_args()
47-
print(args.besu_{version})
47+
print(args.besu_version)
4848

49-
artifacts = create_artifact_paths(args.besu_{version})
49+
artifacts = create_artifact_paths(args.besu_version)
5050
print(artifacts)
5151
for url in artifacts:
5252
check_url(url)

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Changelog
22

33
## Unreleased
4+
### Breaking Changes
5+
### Upcoming Breaking Changes
6+
### Additions and Improvements
7+
- Adds timestamps to enable Prague hardfork on Sepolia and Holesky test networks. [#8163](https://github.com/hyperledger/besu/pull/8163)
8+
- Extend simulate transaction on pending block plugin API [#8174](https://github.com/hyperledger/besu/pull/8174)
9+
10+
### Bug fixes
11+
12+
13+
## 25.1.0
414

515
### Breaking Changes
616
- `--host-whitelist` has been deprecated since 2020 and this option is removed. Use the equivalent `--host-allowlist` instead.

‎acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public void startNode(final BesuNode node) {
183183
.vertx(Vertx.vertx())
184184
.besuController(besuController)
185185
.ethNetworkConfig(ethNetworkConfig)
186-
.discovery(node.isDiscoveryEnabled())
186+
.discoveryEnabled(node.isDiscoveryEnabled())
187187
.p2pAdvertisedHost(node.getHostName())
188188
.p2pListenPort(0)
189189
.networkingConfiguration(node.getNetworkingConfiguration())

‎acceptance-tests/tests/src/test/resources/jsonrpc/engine/cancun/test-cases/block-production/02_cancun_get_blob_tx.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public class RunnerBuilder {
165165
private NetworkingConfiguration networkingConfiguration = NetworkingConfiguration.create();
166166
private final Collection<Bytes> bannedNodeIds = new ArrayList<>();
167167
private boolean p2pEnabled = true;
168-
private boolean discovery;
168+
private boolean discoveryEnabled;
169169
private String p2pAdvertisedHost;
170170
private String p2pListenInterface = NetworkUtility.INADDR_ANY;
171171
private int p2pListenPort;
@@ -237,11 +237,11 @@ public RunnerBuilder p2pEnabled(final boolean p2pEnabled) {
237237
/**
238238
* Enable Discovery.
239239
*
240-
* @param discovery the discovery
240+
* @param discoveryEnabled the discoveryEnabled
241241
* @return the runner builder
242242
*/
243-
public RunnerBuilder discovery(final boolean discovery) {
244-
this.discovery = discovery;
243+
public RunnerBuilder discoveryEnabled(final boolean discoveryEnabled) {
244+
this.discoveryEnabled = discoveryEnabled;
245245
return this;
246246
}
247247

@@ -618,7 +618,7 @@ public Runner build() {
618618
.setBindHost(p2pListenInterface)
619619
.setBindPort(p2pListenPort)
620620
.setAdvertisedHost(p2pAdvertisedHost);
621-
if (discovery) {
621+
if (discoveryEnabled) {
622622
final List<EnodeURL> bootstrap;
623623
if (ethNetworkConfig.bootNodes() == null) {
624624
bootstrap = EthNetworkConfig.getNetworkConfig(NetworkName.MAINNET).bootNodes();
@@ -636,7 +636,7 @@ public Runner build() {
636636
discoveryConfiguration.setFilterOnEnrForkId(
637637
networkingConfiguration.getDiscovery().isFilterOnEnrForkIdEnabled());
638638
} else {
639-
discoveryConfiguration.setActive(false);
639+
discoveryConfiguration.setEnabled(false);
640640
}
641641

642642
final NodeKey nodeKey = besuController.getNodeKey();

‎besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2238,7 +2238,7 @@ private Runner synchronize(
22382238
.natMethod(natMethod)
22392239
.natManagerServiceName(unstableNatOptions.getNatManagerServiceName())
22402240
.natMethodFallbackEnabled(unstableNatOptions.getNatMethodFallbackEnabled())
2241-
.discovery(peerDiscoveryEnabled)
2241+
.discoveryEnabled(peerDiscoveryEnabled)
22422242
.ethNetworkConfig(ethNetworkConfig)
22432243
.permissioningConfiguration(permissioningConfiguration)
22442244
.p2pAdvertisedHost(p2pAdvertisedHost)

‎besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ public BesuController build() {
621621
worldStateHealerSupplier::get);
622622

623623
if (maybeStoredGenesisBlockHash.isEmpty()) {
624-
genesisState.writeStateTo(worldStateArchive.getMutable());
624+
genesisState.writeStateTo(worldStateArchive.getWorldState());
625625
}
626626

627627
transactionSimulator =

‎besu/src/main/java/org/hyperledger/besu/services/BlockSimulatorServiceImpl.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.hyperledger.besu.ethereum.transaction.BlockStateCall;
2727
import org.hyperledger.besu.ethereum.transaction.CallParameter;
2828
import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
29+
import org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams;
2930
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
3031
import org.hyperledger.besu.plugin.Unstable;
3132
import org.hyperledger.besu.plugin.data.BlockOverrides;
@@ -135,8 +136,13 @@ private BlockHeader getBlockHeader(final long blockNumber) {
135136
}
136137

137138
private MutableWorldState getWorldState(final BlockHeader header, final boolean isPersisting) {
139+
final WorldStateQueryParams worldStateQueryParams =
140+
WorldStateQueryParams.newBuilder()
141+
.withBlockHeader(header)
142+
.withShouldWorldStateUpdateHead(isPersisting)
143+
.build();
138144
return worldStateArchive
139-
.getMutable(header, isPersisting)
145+
.getWorldState(worldStateQueryParams)
140146
.orElseThrow(
141147
() ->
142148
new IllegalArgumentException(

0 commit comments

Comments
 (0)