Improve EthereumListener #1152
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,16 +17,17 @@ | |
| */ | ||
| package org.ethereum.config; | ||
|
|
||
| import org.ethereum.core.EventDispatchThread; | ||
| import org.ethereum.core.Repository; | ||
| import org.ethereum.crypto.HashUtil; | ||
| import org.ethereum.datasource.*; | ||
| import org.ethereum.datasource.inmem.HashMapDB; | ||
| import org.ethereum.datasource.leveldb.LevelDbDataSource; | ||
| import org.ethereum.datasource.rocksdb.RocksDbDataSource; | ||
| import org.ethereum.db.*; | ||
| import org.ethereum.listener.EthereumListener; | ||
| import org.ethereum.net.eth.handler.Eth63; | ||
| import org.ethereum.publish.Publisher; | ||
| import org.ethereum.sync.FastSyncManager; | ||
| import org.ethereum.validator.*; | ||
| import org.ethereum.vm.DataWord; | ||
|
|
@@ -78,7 +79,8 @@ BeanPostProcessor initializer() { | |
| } | ||
|
|
||
|
|
||
| @Bean | ||
| @Primary | ||
| public Repository repository() { | ||
| return new RepositoryWrapper(); | ||
| } | ||
|
|
@@ -88,15 +90,16 @@ public Repository defaultRepository() { | |
| return new RepositoryRoot(stateSource(), null); | ||
| } | ||
|
|
||
| @Bean | ||
| @Scope("prototype") | ||
| public Repository repository(byte[] stateRoot) { | ||
| return new RepositoryRoot(stateSource(), stateRoot); | ||
| } | ||
|
|
||
| /** | ||
| * A source of nodes for state trie and all contract storage tries. <br/> | ||
| * This source provides contract code too. <br/><br/> | ||
| * <p> | ||
| * Picks node by 16-bytes prefix of its key. <br/> | ||
| * Within {@link NodeKeyCompositor} this source is a part of ref counting workaround<br/><br/> | ||
| * | ||
|
|
@@ -128,7 +131,7 @@ public StateSource stateSource() { | |
| @Bean | ||
| @Scope("prototype") | ||
| public Source<byte[], byte[]> cachedDbSource(String name) { | ||
| AbstractCachedSource<byte[], byte[]> writeCache = new AsyncWriteCache<byte[], byte[]>(blockchainSource(name)) { | ||
| @Override | ||
| protected WriteCache<byte[], byte[]> createCache(Source<byte[], byte[]> source) { | ||
| WriteCache.BytesKey<byte[]> ret = new WriteCache.BytesKey<>(source, WriteCache.CacheType.SIMPLE); | ||
|
|
@@ -168,7 +171,7 @@ public DbSource<byte[]> keyValueDataSource(String name, DbSettings settings) { | |
| DbSource<byte[]> dbSource; | ||
| if ("inmem".equals(dataSource)) { | ||
| dbSource = new HashMapDB<>(); | ||
| } else if ("leveldb".equals(dataSource)) { | ||
| dbSource = levelDbDataSource(); | ||
| } else { | ||
| dataSource = "rocksdb"; | ||
|
|
@@ -222,9 +225,14 @@ private void resetDataSource(Source source) { | |
| } | ||
| } | ||
|
|
||
| @Bean | ||
| public Publisher publisher(EventDispatchThread eventDispatchThread) { | ||
| return new Publisher(eventDispatchThread); | ||
| } | ||
|
|
||
| @Bean | ||
| public EthereumListener ethereumListener(Publisher publisher) { | ||
| return publisher.asListener(); | ||
| } | ||
|
|
||
| @Bean | ||
|
|
@@ -262,16 +270,18 @@ public byte[] serialize(byte[] object) { | |
| ret.add(new DataWord(1)); | ||
| return ret.getLast20Bytes(); | ||
| } | ||
|
|
||
| public byte[] deserialize(byte[] stream) { | ||
| throw new RuntimeException("Shouldn't be called"); | ||
| } | ||
| }, new Serializer<ProgramPrecompile, byte[]>() { | ||
| public byte[] serialize(ProgramPrecompile object) { | ||
| return object == null ? null : object.serialize(); | ||
| } | ||
|
|
||
| public ProgramPrecompile deserialize(byte[] stream) { | ||
| return stream == null ? null : ProgramPrecompile.deserialize(stream); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -290,14 +300,14 @@ public DbFlushManager dbFlushManager() { | |
| } | ||
|
|
||
| @Bean | ||
| public BlockHeaderValidator headerValidator(SystemProperties systemProperties, Publisher publisher) { | ||
|
There was a problem hiding this comment. I don't think it'll be handy in all cases. There was a problem hiding this comment. @eugene-shevchenko any thoughts on that? There was a problem hiding this comment. The method uses only in java config, and as I mentioned earlier such bean definition hides component dependencies. With no arguments option I should invoke three factory methods in method's body to get necessary dependencies. But if you think that no-args option is better I can revert method's signature. PS: It's sad that java config which should configure There was a problem hiding this comment. I think it's not a bad thing if we want to get rid of Spring one day. |
||
|
|
||
| List<BlockHeaderRule> rules = new ArrayList<>(asList( | ||
| new GasValueRule(), | ||
| new ExtraDataRule(systemProperties), | ||
| EthashRule.createRegular(systemProperties, publisher), | ||
| new GasLimitRule(systemProperties), | ||
| new BlockHashRule(systemProperties) | ||
| )); | ||
|
|
||
| return new BlockHeaderValidator(rules); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am thinking of keeping old listeners and new pub/sub scheme completely decoupled from each other. This is about stable backward compatibility, there is just much smaller chance to break something.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition to stable backward compatibility we may leave such things like
trace(),onPendingTransactionReceived(),onBlock(BlockSummary summary)behindThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
onPendingTransactionReceived()method