diff --git a/scripts/alphanet_version b/scripts/alphanet_version index c5ddcdcc0..f7d9ea7da 100644 --- a/scripts/alphanet_version +++ b/scripts/alphanet_version @@ -1 +1 @@ -2017-09-22 +2017-10-13 diff --git a/scripts/gen_genesis.ml b/scripts/gen_genesis.ml index e366d8f0a..0998c66c5 100644 --- a/scripts/gen_genesis.ml +++ b/scripts/gen_genesis.ml @@ -1,6 +1,6 @@ let prefix = "BLockGenesisGenesisGenesisGenesisGenesis" -let suffix = "BBBBB" +let suffix = "DDDDD" let p = Base58.raw_decode (prefix ^ suffix ^ "crcCRC") let p = String.sub p 0 (String.length p - 4) let p = Base58.safe_encode p diff --git a/src/node/main/node_run_command.ml b/src/node/main/node_run_command.ml index b757e4e6c..b62df094a 100644 --- a/src/node/main/node_run_command.ml +++ b/src/node/main/node_run_command.ml @@ -11,10 +11,10 @@ open Logging.Node.Main let genesis : State.Net.genesis = { time = - Time.of_notation_exn "2017-09-22T00:00:00Z" ; + Time.of_notation_exn "2017-10-13T00:00:00Z" ; block = Block_hash.of_b58check_exn - "BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU" ; + "BLockGenesisGenesisGenesisGenesisGenesisDDDDDegibDt" ; protocol = Protocol_hash.of_b58check_exn "ProtoGenesisGenesisGenesisGenesisGenesisGenesk612im" ; diff --git a/src/node/shell/distributed_db_message.ml b/src/node/shell/distributed_db_message.ml index bcfebd229..7b5524e60 100644 --- a/src/node/shell/distributed_db_message.ml +++ b/src/node/shell/distributed_db_message.ml @@ -174,7 +174,7 @@ let versions = let open P2p.Version in [ { name = "TEZOS" ; major = 0 ; - minor = 24 ; + minor = 25 ; } ] diff --git a/test/test_basic.sh b/test/test_basic.sh index f0cec55aa..d1e9a141f 100755 --- a/test/test_basic.sh +++ b/test/test_basic.sh @@ -33,7 +33,7 @@ $client get balance for $key2 | assert "999.95 ęś©" # wait for the delay between two block sleep 1 -$client mine for bootstrap1 +$client mine for bootstrap1 -max-priority 512 $client remember program noop file:contracts/noop.tz $client typecheck program noop diff --git a/test/test_multinode.sh b/test/test_multinode.sh index a7cee0dbc..b886367fe 100755 --- a/test/test_multinode.sh +++ b/test/test_multinode.sh @@ -66,22 +66,22 @@ retry() { done } -$client1 mine for bootstrap1 +$client1 mine for bootstrap1 -max-priority 512 retry 2 15 assert_propagation_level 2 -$client2 mine for bootstrap2 +$client2 mine for bootstrap2 -max-priority 512 retry 2 15 assert_propagation_level 3 -$client3 mine for bootstrap3 +$client3 mine for bootstrap3 -max-priority 512 retry 2 15 assert_propagation_level 4 -$client4 mine for bootstrap4 +$client4 mine for bootstrap4 -max-priority 512 retry 2 15 assert_propagation_level 5 endorse_hash=$($client3 endorse for bootstrap3 | extract_operation_hash) transfer_hash=$($client4 transfer 500 from bootstrap1 to bootstrap3 | extract_operation_hash) -retry 2 15 $client4 mine for bootstrap4 +retry 2 15 $client4 mine for bootstrap4 -max-priority 512 assert_contains_operation() { hash="$1"