diff --git a/README.md b/README.md index ad81190..f4da5a0 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ Imports blocks and transactions from the Ethereum blockchain into ElasticSearch, Demo video: [YouTube](https://www.youtube.com/watch?v=FFI9OnW9IuI) Tested with -- ElasticSeach 5.6.2 +- ElasticSeach 6.2.3 - MongoDB 3.4.10 - HazelCast 3.6.3 -- geth 1.7.1. +- geth 1.8.2 ### Building Build with diff --git a/application.json b/application.json index 0a68d8c..6635c38 100644 --- a/application.json +++ b/application.json @@ -1,11 +1,11 @@ { - "startBlock" : "1964770", - "blockEnd" : "1964900", - "storage" : "MONGODB", + "startBlock" : "2022252", + "blockEnd" : "2025555", + "storage" : "ELASTICSEARCH", "ipc" : "\\\\.\\pipe\\geth.ipc", "os" : "WINDOWS", - "txIndex" : "ether-tx-demo-iix", - "blockIndex" : "etdder-block-demo-iix", + "txIndex" : "eth-tx", + "blockIndex" : "eth-block", "backpressureBlocks" : 5, "backPressureTx" : 35, "txImport" : true, diff --git a/build.gradle b/build.gradle index 38813ee..dd42991 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'idea' apply plugin: 'maven' -project.version = "1.0.1-SNAPSHOT" +project.version = "1.0.2" project.group = 'com.codingchili.ethereumingest' sourceCompatibility = 1.8 @@ -12,7 +12,6 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } - repositories { mavenLocal() maven { url 'https://jitpack.io' } @@ -20,8 +19,8 @@ repositories { } dependencies { - compile 'com.github.codingchili.chili-core:core:1.0.18-SNAPSHOT@jar' - compile 'org.web3j:core:2.3.1' + compile 'com.github.codingchili.chili-core:core:1.0.22@jar' + compile 'org.web3j:core:3.3.1' } test { diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 11f857a..0000000 --- a/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -#org.gradle.parallel=true -#org.gradle.configureondemand=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a2d08ff..ed88a04 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2091d04..bf03c01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Mar 14 08:11:26 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip diff --git a/gradlew b/gradlew index 4453cce..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } diff --git a/src/main/java/com/codingchili/ethereumingest/Service.java b/src/main/java/com/codingchili/ethereumingest/Service.java index 8b4c4fc..d1dcfb9 100644 --- a/src/main/java/com/codingchili/ethereumingest/Service.java +++ b/src/main/java/com/codingchili/ethereumingest/Service.java @@ -19,7 +19,7 @@ public class Service implements CoreService { public static void main(String[] args) throws IOException { system().setHandlers(1).setListeners(1); launcher().setApplication("Ethereum Ingest") - .setVersion("1.0.1") + .setVersion("1.0.2") .setAuthor("codingchili@github") .setClustered(true) .deployable(Service.class);