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.

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

Move build branch to commit 479530dbc PLUS CHERRY PICKS #4

Conversation

Chengxuan
Copy link

@Chengxuan Chengxuan commented Dec 13, 2023

PR description

  • Update the build branch to pick up commit 479530d
  • PLUS the cherry picks

Fixed Issue(s)

for https://github.com/kaleido-io/kaleido-planning/issues/2180#issuecomment-1853483285

matthew1001 and others added 8 commits June 20, 2023 16:05
…he enode is allowed (hyperledger#5584)

* Use the node's configuration to decide if adding a peer with DNS in the enode is allowed

Signed-off-by: Matthew Whitehead <[email protected]>

* Update command test mocks

Signed-off-by: Matthew Whitehead <[email protected]>

* Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>

* Address PR comments. Add a reference in the change log. Fix failing integration test.

Signed-off-by: Matthew Whitehead <[email protected]>

* Add the same DNS-config checking logic to admin_removePeer, along with a unit test file for it

Signed-off-by: Matthew Whitehead <[email protected]>

* Tweak the change log

Signed-off-by: Matthew Whitehead <[email protected]>

* Add clearer error messages for the cases where enode DNS is disabled (but a hostname one has been specified in the URL) or where DNS name resolution failed

Signed-off-by: Matthew Whitehead <[email protected]>

* Spotless Java fixes

Signed-off-by: Matthew Whitehead <[email protected]>

* Fix copyright for new file

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>

* Address PR comments (mainly copyright & constant renaming)

Signed-off-by: Matthew Whitehead <[email protected]>

* move changelog entry to 23.4.4

Signed-off-by: Sally MacFarlane <[email protected]>

---------

Signed-off-by: Matthew Whitehead <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>
Signed-off-by: Sally MacFarlane <[email protected]>
Co-authored-by: Matthew Whitehead <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
…er#5669)

* Modify the min-gas-price option validation
* Check for whether ethash is in use, either from genesis or network config, and use that for miner checks
* Add genesis configuration isPoa() convenience function

---------

Signed-off-by: Matthew Whitehead <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>
Co-authored-by: Simon Dudley <[email protected]>
Signed-off-by:  Simon Dudley <[email protected]>
…he enode is allowed (hyperledger#5584)

* Use the node's configuration to decide if adding a peer with DNS in the enode is allowed

Signed-off-by: Matthew Whitehead <[email protected]>

* Update command test mocks

Signed-off-by: Matthew Whitehead <[email protected]>

* Update besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>

* Address PR comments. Add a reference in the change log. Fix failing integration test.

Signed-off-by: Matthew Whitehead <[email protected]>

* Add the same DNS-config checking logic to admin_removePeer, along with a unit test file for it

Signed-off-by: Matthew Whitehead <[email protected]>

* Tweak the change log

Signed-off-by: Matthew Whitehead <[email protected]>

* Add clearer error messages for the cases where enode DNS is disabled (but a hostname one has been specified in the URL) or where DNS name resolution failed

Signed-off-by: Matthew Whitehead <[email protected]>

* Spotless Java fixes

Signed-off-by: Matthew Whitehead <[email protected]>

* Fix copyright for new file

Co-authored-by: Sally MacFarlane <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>

* Address PR comments (mainly copyright & constant renaming)

Signed-off-by: Matthew Whitehead <[email protected]>

* move changelog entry to 23.4.4

Signed-off-by: Sally MacFarlane <[email protected]>

---------

Signed-off-by: Matthew Whitehead <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>
Signed-off-by: Sally MacFarlane <[email protected]>
Co-authored-by: Matthew Whitehead <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
* Add lock to creation of pending transaction stream

Signed-off-by: Matthew Whitehead <[email protected]>

* Alternative synchonization of signalInvalidAndRemoveDependentTransactions

Signed-off-by: Fabio Di Fabio <[email protected]>

---------

Signed-off-by: Matthew Whitehead <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Matthew Whitehead <[email protected]>
Co-authored-by: Fabio Di Fabio <[email protected]>
…er#5669)

* Modify the min-gas-price option validation
* Check for whether ethash is in use, either from genesis or network config, and use that for miner checks
* Add genesis configuration isPoa() convenience function

---------

Signed-off-by: Matthew Whitehead <[email protected]>
Signed-off-by: Matt Whitehead <[email protected]>
Co-authored-by: Simon Dudley <[email protected]>
Signed-off-by:  Simon Dudley <[email protected]>
…nto kaleido-noderunner-dev-cherry-pick-479530dbc

Signed-off-by: Chengxuan Xing <[email protected]>
@Chengxuan
Copy link
Author

besu version built from this branch: 23.4.2-dev-6791220f

matthew1001
matthew1001 previously approved these changes Dec 13, 2023
Copy link

@matthew1001 matthew1001 left a comment

Choose a reason for hiding this comment

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

This gets us back to the same commit we were running on previously, approving.

@Chengxuan Chengxuan changed the title Move build branch to commit 479530dbc Move build branch to commit 479530dbc PLUS CHERRY PICKS Dec 13, 2023
@Chengxuan Chengxuan dismissed matthew1001’s stale review December 13, 2023 10:51

as per discussion, this picks up cherry picks

@matthew1001 matthew1001 force-pushed the kaleido-noderunner-dev branch from 88e68e4 to 479530d Compare December 13, 2023 11:43
@Chengxuan Chengxuan closed this Dec 13, 2023
@Chengxuan Chengxuan deleted the kaleido-noderunner-dev-cherry-pick-479530dbc branch December 13, 2023 13:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants