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

Expose chain ID in the BlockchainService plugin API #7702

Merged
merged 5 commits into from
Oct 2, 2024
Merged

Expose chain ID in the BlockchainService plugin API #7702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32d0f17
Expose chain ID in the BlockchainService plugin API
Gabriel-Trintinalia Oct 1, 2024
ad7fca4
Merge branch 'main' into expose-chain-id-plugin-api
Gabriel-Trintinalia Oct 1, 2024
62a3ebf
Add a changelog entry
Gabriel-Trintinalia Oct 1, 2024
d33917d
Merge main into branch
Gabriel-Trintinalia Oct 2, 2024
587e498
Merge branch 'main' into expose-chain-id-plugin-api
Gabriel-Trintinalia Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Add configuration of Consolidation Request Contract Address via genesis configuration [#7647](https://github.com/hyperledger/besu/pull/7647)
- Interrupt pending transaction processing on block creation timeout [#7673](https://github.com/hyperledger/besu/pull/7673)
- Align gas cap calculation for transaction simulation to Geth approach [#7703](https://github.com/hyperledger/besu/pull/7703)
- Expose chainId in the `BlockchainService` [7702](https://github.com/hyperledger/besu/pull/7702)

### Bug fixes
- Fix mounted data path directory permissions for besu user [#7575](https://github.com/hyperledger/besu/pull/7575)
Expand Down
9 changes: 9 additions & 0 deletions besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.hyperledger.besu.plugin.data.TransactionReceipt;
import org.hyperledger.besu.plugin.services.BlockchainService;

import java.math.BigInteger;
import java.util.List;
import java.util.Optional;
import java.util.function.Supplier;
Expand Down Expand Up @@ -182,4 +183,12 @@ public BlockBody getBlockBody() {
}
};
}

@Override
public Optional<BigInteger> getChainId() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I like fail fast, I am tempted to raise an error is the service is used before it is initialized, but this probably is for another PR, since it can apply to other methods as well

if (protocolSchedule == null) {
return Optional.empty();
}
return protocolSchedule.getChainId();
}
}
2 changes: 1 addition & 1 deletion plugin-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '5H+3gUzCwZtLByfnk11kf+kAPwykQ+WR+n3xWgyfsyY='
knownHash = '4jVaj9yW88nHbX0KmTR3dPQRvj9x8Pvh5E9Ry7KRT6w='
}
check.dependsOn('checkAPIChanges')

Expand Down
9 changes: 8 additions & 1 deletion plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BlockchainService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.hyperledger.besu.plugin.data.BlockHeader;
import org.hyperledger.besu.plugin.data.TransactionReceipt;

import java.math.BigInteger;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -106,5 +107,11 @@ void setFinalizedBlock(Hash blockHash)
* @throws UnsupportedOperationException if the network is a PoS network
*/
void setSafeBlock(Hash blockHash) throws IllegalArgumentException, UnsupportedOperationException;
;

/**
* Get the chain id
*
* @return the chain id
*/
Optional<BigInteger> getChainId();
}
Loading