Merge pull request #1638 from aeternity/PT-160262754-bump-consensus

Bump consensus version since last release
aeternity · Oct 11, 2018 · 0204d16 · 0204d16
2 parents 3d8966a + d2782f4
commit 0204d16
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/apps/aecore/include/blocks.hrl b/apps/aecore/include/blocks.hrl
@@ -1,6 +1,6 @@
 -include("pow.hrl").
 
--define(PROTOCOL_VERSION, 24).
+-define(PROTOCOL_VERSION, 25).
 -define(GENESIS_VERSION, ?PROTOCOL_VERSION).
 -define(GENESIS_HEIGHT, 0).
 -define(GENESIS_TIME, 0).

diff --git a/apps/aecore/test/aec_mining_tests.erl b/apps/aecore/test/aec_mining_tests.erl
@@ -34,7 +34,7 @@ mine_block_test_() ->
                  % in order to find a proper nonce for your
                  % block uncomment the line below
                  % let_it_crash = generate_valid_test_data(TopBlock, 100000000000000),
-                 Nonce = 1493667767768346439,
+                 Nonce = 7450175937004983876,
                  {BlockCandidate,_} = aec_test_utils:create_keyblock_with_state(
                                         [{TopBlock, aec_trees:new()}], ?TEST_PUB),
 

diff --git a/apps/aeutils/test/data/epoch_full.yaml b/apps/aeutils/test/data/epoch_full.yaml
@@ -108,7 +108,7 @@ chain:
     db_path: .
     # Hard forks
     hard_forks:
-      "24": 0
+      "25": 0
 
 mining:
     # Start mining automatically.

diff --git a/deployment/DB_VERSION b/deployment/DB_VERSION
@@ -1 +1 @@
-96
+97
diff --git a/py/tests/integration/common.py b/py/tests/integration/common.py
@@ -116,7 +116,7 @@ def make_no_mining_user_config(root_dir, file_name):
 ---
 chain:
     hard_forks:
-        "24": 0
+        "25": 0
 
 mining:
     autostart: false
@@ -137,7 +137,7 @@ def make_mining_user_config(root_dir, key_dir, beneficiary, file_name):
 ---
 chain:
     hard_forks:
-        "24": 0
+        "25": 0
 keys:
     dir: "{}"
 

diff --git a/py/tests/integration/test_use_cases.py b/py/tests/integration/test_use_cases.py
@@ -304,7 +304,7 @@ def make_fast_mining_user_config(root_dir, file_name):
 
 chain:
     hard_forks:
-        "24": 0
+        "25": 0
 
 mining:
     autostart: true
@@ -334,7 +334,7 @@ def make_no_mining_user_config(root_dir, file_name):
 
 chain:
     hard_forks:
-        "24": 0
+        "25": 0
 
 mining:
     autostart: false