#132 Wrong ETH Contract Balance

-- move to gradle 4.7 -- remove depricated UseCGroupMemoryLimitForHeap
cybercongress · May 25, 2018 · 338873a · 338873a
1 parent d68311a
commit 338873a
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 17 deletions.
diff --git a/build-and-run-docker-image.sh b/build-and-run-docker-image.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t build/dump-eth -f ./pumps/bitcoin/Dockerfile ./
-docker run -e CHAIN=BITCOIN -e CS_LOG_LEVEL=TRACE --net=host build/pump-btc
+docker build -t build/pump-eth -f ./pumps/ethereum/Dockerfile ./
+docker run -e CHAIN_FAMILY=ETHEREUM -e CS_LOG_LEVEL=TRACE --net=host build/pump-eth
diff --git a/build.gradle b/build.gradle
@@ -59,7 +59,7 @@ buildscript {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.3.1'
+    gradleVersion = '4.7'
     distributionType = Wrapper.DistributionType.ALL
 }
 

diff --git a/contract-summary/ethereum/Dockerfile b/contract-summary/ethereum/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :contract-summary:ethereum:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/contract-summary/ethereum/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
+ENTRYPOINT exec java $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
diff --git a/dumps/bitcoin/Dockerfile b/dumps/bitcoin/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :dumps:bitcoin:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/dumps/bitcoin/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/bitcoin.jar
+ENTRYPOINT exec java $JAVA_OPTS -jar /cyberapp/bin/bitcoin.jar
diff --git a/dumps/ethereum/Dockerfile b/dumps/ethereum/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :dumps:ethereum:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/dumps/ethereum/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
+ENTRYPOINT exec java $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/pumps/bitcoin/Dockerfile b/pumps/bitcoin/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :pumps:bitcoin:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/pumps/bitcoin/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/bitcoin.jar
+ENTRYPOINT exec java $JAVA_OPTS -jar /cyberapp/bin/bitcoin.jar
diff --git a/pumps/ethereum/Dockerfile b/pumps/ethereum/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :pumps:ethereum:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/pumps/ethereum/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
+ENTRYPOINT exec java $JAVA_OPTS -jar /cyberapp/bin/ethereum.jar
diff --git a/search-api/Dockerfile b/search-api/Dockerfile
@@ -7,5 +7,4 @@ RUN ./gradlew clean :search-api:assemble
 # Container with application
 FROM openjdk:10-jre-slim
 COPY --from=build /build/search-api/build/libs /cyberapp/bin
-ENV JAVA_CGROUP_OPTS = "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 -XshowSettings:vm"
-ENTRYPOINT exec java $JAVA_CGROUP_OPTS $JAVA_OPTS -jar /cyberapp/bin/search-api.jar
+ENTRYPOINT ["java", "-jar", "/cyberapp/bin/search-api.jar"]