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

Update dependencies - commons-net #5444

Merged
merged 5 commits into from
May 10, 2023
Merged

Conversation

macfarla
Copy link
Contributor

@macfarla macfarla commented May 9, 2023

Refs #5386
This PR forces the commons-net version to be 3.9.0 but we can't do the same for antlr. antlr version needs to match the version in tuweni. So we need a tuweni release before we can update antlr.
This PR has the version we want but it's not yet released apache/incubator-tuweni#479

@github-actions
Copy link

github-actions bot commented May 9, 2023

  • I thought about documentation and added the doc-change-required label to this PR if updates are required.
  • I have considered running ./gradlew acceptanceTestNonMainnet locally if my PR affects non-mainnet modules.
  • I thought about the changelog and included a changelog update if required.
  • If my PR includes database changes (e.g. KeyValueSegmentIdentifier) I have thought about compatibility and performed forwards and backwards compatibility tests

Signed-off-by: Sally MacFarlane <[email protected]>
@macfarla macfarla changed the title Update dependencies - antlr, commons-net Update dependencies - commons-net May 9, 2023
Copy link
Contributor

@siladu siladu left a comment

Choose a reason for hiding this comment

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

Maybe some extra stuff in verification-metadata but don't think it really matters?

gradle/versions.gradle Show resolved Hide resolved
@macfarla macfarla enabled auto-merge (squash) May 10, 2023 01:52
@macfarla macfarla merged commit a735456 into hyperledger:main May 10, 2023
@macfarla macfarla deleted the antlr-dep branch May 10, 2023 04:40
fab-10 pushed a commit to fab-10/besu that referenced this pull request May 10, 2023
* Update dependencies - commons-net (hyperledger#5444)

* update antlr and commons-net dependencies

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

* revert antlr uprev

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

* comment

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

---------

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

* Add option to send SNI header in TLS ClientHello message (hyperledger#4894) (hyperledger#5439)

* add --Xp2p-tls-clienthello-sni option to enable the SNI header

Issue hyperledger#4894

Signed-off-by: Sebastian Bathke <[email protected]>
Signed-off-by: Sally MacFarlane <[email protected]>
Co-authored-by: Sebastian Bathke <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>

* ZkTrieLogFactoryImpl, rebased off of main

Signed-off-by: garyschulte <[email protected]>

* code before account

Signed-off-by: garyschulte <[email protected]>

* trielog shipping observer

Signed-off-by: garyschulte <[email protected]>

* use hex encoding in trielog shipping, add a TESTING default ZkTrieLogObserver to AbstractTrieLogManager

Signed-off-by: garyschulte <[email protected]>

* fix unintended recursion

Signed-off-by: garyschulte <[email protected]>

* filter out self destruct storage changes in ZkTrieLogImpl

Signed-off-by: garyschulte <[email protected]>

* store both slotHash and slotKey, defer to shomei to handle it as it sees fit

Signed-off-by: garyschulte <[email protected]>

* reorder trielog storage to differentiate between ZERO slot key and null slot key

Signed-off-by: garyschulte <[email protected]>

* do not filter unchanged accounts for zktrielogfactory

Signed-off-by: garyschulte <[email protected]>

* use blockHeader during trielog construction, add blockNumber to trielog, add blockHeader to trielogaddedevent

Signed-off-by: garyschulte <[email protected]>

* add blockNumber to rpc call to shomei

Signed-off-by: garyschulte <[email protected]>

* add isSyncing to the trieLogParameter and ZkTrieLogObserver

Signed-off-by: garyschulte <[email protected]>

* initial plumbing for trielog shipping plugin

Signed-off-by: garyschulte <[email protected]>

* halfway through generics hell

Signed-off-by: garyschulte <[email protected]>

* TrieLogs in plugin data

Signed-off-by: garyschulte <[email protected]>

* end of friday, green build with plugin refactoring, still need to add TrieLog Plugin Service

Signed-off-by: garyschulte <[email protected]>

* remove errant reference to ZkTrieLogFactory

Signed-off-by: garyschulte <[email protected]>

* adding dagger-wired plugincontext and TrieLogService

Signed-off-by: garyschulte <[email protected]>

* javadoc and fixes

Signed-off-by: garyschulte <[email protected]>

* add plugin observer subscription

Signed-off-by: garyschulte <[email protected]>

* plugin-api hash

Signed-off-by: garyschulte <[email protected]>

* fix besuComponent ref, move addService up into BesuContext

Signed-off-by: garyschulte <[email protected]>

* add TrieLogRangePair composition of blocknumber and TrieLog, use that for getTrieLogByRange return

Signed-off-by: garyschulte <[email protected]>

* javadoc

Signed-off-by: garyschulte <[email protected]>

* move TrieLog from datatypes to plugin-api

Signed-off-by: garyschulte <[email protected]>

* add blockHash to TrieLogRangeTuple

Signed-off-by: garyschulte <[email protected]>

---------

Signed-off-by: Sally MacFarlane <[email protected]>
Signed-off-by: Sebastian Bathke <[email protected]>
Signed-off-by: garyschulte <[email protected]>
Co-authored-by: Sally MacFarlane <[email protected]>
Co-authored-by: Sebastian Bathke <[email protected]>
Co-authored-by: Sebastian Bathke <[email protected]>
elenduuche pushed a commit to elenduuche/besu that referenced this pull request Aug 16, 2023
* update antlr and commons-net dependencies

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

* revert antlr uprev

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

* comment

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

---------

Signed-off-by: Sally MacFarlane <[email protected]>
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
* update antlr and commons-net dependencies

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

* revert antlr uprev

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

* comment

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

---------

Signed-off-by: Sally MacFarlane <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants