Merge pull request #1766 from aeternity/PT-161587081-tweak_cuckoo

Update to tweaked cuckoo + tweak verification (and tests)
aeternity · Nov 13, 2018 · d226983 · d226983
2 parents f66ae79 + 5c47f15
commit d226983
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
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 = 2842318173940299374,
+                 Nonce = 8116356783679140109,
                  {BlockCandidate,_} = aec_test_utils:create_keyblock_with_state(
                                         [{TopBlock, aec_trees:new()}], ?TEST_PUB),
 

diff --git a/apps/aecore/test/aec_pow_cuckoo_tests.erl b/apps/aecore/test/aec_pow_cuckoo_tests.erl
@@ -16,7 +16,7 @@
 
 -define(TEST_BIN, <<"wsffgujnjkqhduihsahswgdf">>).
 
--define(TEST_HIGH_NONCE, 74). %% Nonce with solution with high target.
+-define(TEST_HIGH_NONCE, 38). %% Nonce with solution with high target.
 
 pow_test_() ->
     {setup,

diff --git a/apps/aecuckoo/Makefile b/apps/aecuckoo/Makefile
@@ -26,7 +26,7 @@ BLAKE_2B_SRC ?= ../crypto/blake2b-ref.c
 # end Flags from upstream
 
 REPO = https://github.com/aeternity/cuckoo.git
-COMMIT = 51351332d23a11bc30e2457bd98f1c2ba358eb1e
+COMMIT = a66b88ab8514b7232b1e148a4760f9258d5457f0
 
 .PHONY: all
 all: $(EXECUTABLES)

diff --git a/apps/aecuckoo/test/aecuckoo_SUITE.erl b/apps/aecuckoo/test/aecuckoo_SUITE.erl
@@ -33,7 +33,7 @@ groups() ->
     ].
 
 init_per_group(smoke_tests_15, Config) ->
-    [{nonce, 86} | Config];
+    [{nonce, 28} | Config];
 init_per_group(mean15, Config) ->
     [{miner, 'mean15-generic'} | Config];
 init_per_group(lean15, Config) ->

diff --git a/apps/aeutils/src/aeu_siphash24.erl b/apps/aeutils/src/aeu_siphash24.erl
@@ -48,7 +48,8 @@ hash(K0, K1, K2, K3, Nonce) ->
     V3 = K3 bxor Nonce,
     {V01, V11, V21, V31} =
         sip_round(sip_round(sip_round(sip_round(sip_change(Nonce, sip_round(sip_round({V0, V1, V2, V3}))))))),
-    ((V01 bxor V11) bxor (V21 bxor V31)) band 16#ffffffffffffffff.
+    rotl64(((V01 bxor V11) bxor (V21 bxor V31)), 17) band 16#ffffffffffffffff.
+
 
 %%%=============================================================================
 %%% Internal functions

diff --git a/deployment/DB_VERSION b/deployment/DB_VERSION
@@ -1 +1 @@
-110
+111