Merge pull request #112 from ethereum/develop

use Yolov2
ethereum · Oct 29, 2020 · ab0e685 · ab0e685
2 parents ebacb54 + 60bef1d
commit ab0e685
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,8 +14,8 @@ HunterGate(
 	LOCAL
 )
 
-project(retesteth VERSION 0.0.8)
-set(VERSION_SUFFIX "docker")
+project(retesteth VERSION 0.0.9)
+set(VERSION_SUFFIX "berlin")
 
 set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)

diff --git a/circle.yml b/circle.yml
@@ -149,23 +149,23 @@ jobs:
       - image: ethereum/cpp-build-env:7
     steps: *linux-steps
 
-  macOS-XCode9:
+  macOS-XCode10:
     environment:
       - CXX: clang++
       - GCOV: gcov
       - GENERATOR: Ninja
       - BUILD_PARALLEL_JOBS: 8
       - TEST_PARALLEL_JOBS: 8
     macos:
-      xcode: "9.0"
+      xcode: "10.0"
     steps:
       - checkout
       - *environment-info
       - run:
           name: "Install macOS dependencies"
           # Python3 and requests are needed for Hunter upload.
           command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install -q llvm37 cmake ninja python3
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install -q cmake ninja python3
             pip3 install -q requests gitpython
       - *configureMac
 #      - *upload-hunter-cache
@@ -182,6 +182,6 @@ workflows:
   version: 2
   cpp-ethereum:
     jobs:
-      - macOS-XCode9
+      - macOS-XCode10
       - Linux-Clang6
       - Linux-GCC6-Debug
diff --git a/retesteth/configs/genesis/default/Berlin.cpp b/retesteth/configs/genesis/default/Berlin.cpp
@@ -21,7 +21,7 @@ const string default_Berlin_config = R"({
 
 const string t8ntool_Berlin_config = R"({
     "params" : {
-        "fork" : "YOLOv1",
+        "fork" : "YOLOv2",
         "constantinopleForkBlock" : "0x00",
         "byzantiumForkBlock" : "0x00",
         "homesteadForkBlock" : "0x00"

diff --git a/retesteth/configs/genesis/default/correctMiningReward.cpp b/retesteth/configs/genesis/default/correctMiningReward.cpp
@@ -28,8 +28,9 @@ const string t8ntool_correctMiningReward_config = R"({
     "Istanbul":          "2000000000000000000",
     "Berlin" :           "2000000000000000000",
 
-    "//comment" : "Retesteth calculate rewards on behalf ot the tool when filling state tests",
-    "YOLOv1" :           "2000000000000000000"
+    "//comment" : "Retesteth calculate rewards on behalf of the tool when filling state tests",
+    "YOLOv1" :           "2000000000000000000",
+    "YOLOv2" :           "2000000000000000000"
 })";
 
 genRewardsCfg::genRewardsCfg()