From efb1a858489c88f97d3e20f64c523f03f0202f42 Mon Sep 17 00:00:00 2001 From: vub Date: Sun, 16 Apr 2017 14:42:19 -0400 Subject: [PATCH] Moved validator index inside the message --- casper4/simple_casper.v.py | 124 +++++++++++++++++--------------- casper4/simple_casper_tester.py | 108 ++++++++++++++-------------- 2 files changed, 120 insertions(+), 112 deletions(-) diff --git a/casper4/simple_casper.v.py b/casper4/simple_casper.v.py index a0b485a..d6dfcab 100644 --- a/casper4/simple_casper.v.py +++ b/casper4/simple_casper.v.py @@ -203,16 +203,17 @@ def deposit(validation_addr: address, withdrawal_addr: address): # Log in or log out from the validator set. A logged out validator can log # back in later, if they do not log in for an entire withdrawal period, # they can get their money out -def flick_status(validator_index: num, logout_msg: bytes <= 1024): +def flick_status(logout_msg: bytes <= 1024): assert self.current_epoch == block.number / self.epoch_length # Get hash for signature, and implicitly assert that it is an RLP list # consisting solely of RLP elements sighash = extract32(raw_call(self.sighasher, logout_msg, gas=200000, outsize=32), 0) # Extract parameters - values = RLPList(logout_msg, [num, bool, bytes]) - epoch = values[0] - login_flag = values[1] - sig = values[2] + values = RLPList(logout_msg, [num, num, bool, bytes]) + validator_index = values[0] + epoch = values[1] + login_flag = values[2] + sig = values[3] assert self.current_epoch == epoch # Signature check assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash, sig), gas=500000, outsize=32), 0) == as_bytes32(1) @@ -310,25 +311,28 @@ def check_eligible_in_epoch(validator_index: num, epoch: num) -> num(const): return o # Process a prepare message -def prepare(validator_index: num, prepare_msg: bytes <= 1024): +def prepare(prepare_msg: bytes <= 1024): # Get hash for signature, and implicitly assert that it is an RLP list # consisting solely of RLP elements sighash = extract32(raw_call(self.sighasher, prepare_msg, gas=200000, outsize=32), 0) # Extract parameters - values = RLPList(prepare_msg, [num, bytes32, bytes32, num, bytes32, bytes]) - epoch = values[0] - hash = values[1] - ancestry_hash = values[2] - source_epoch = values[3] - source_ancestry_hash = values[4] - sig = values[5] - # For now, the sig is a simple ECDSA sig + values = RLPList(prepare_msg, [num, num, bytes32, bytes32, num, bytes32, bytes]) + validator_index = values[0] + epoch = values[1] + hash = values[2] + ancestry_hash = values[3] + source_epoch = values[4] + source_ancestry_hash = values[5] + sig = values[6] + new_ancestry_hash = sha3(concat(hash, ancestry_hash)) + # Hash for purposes of identifying this (epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash) combination + sourcing_hash = sha3(concat(as_bytes32(epoch), hash, ancestry_hash, as_bytes32(source_epoch), source_ancestry_hash)) # Check the signature assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash, sig), gas=500000, outsize=32), 0) == as_bytes32(1) # Check that we are in an epoch after we started validating assert self.current_epoch >= self.dynasty_start_epoch[self.validators[validator_index].dynasty_start] # Check that this prepare has not yet been made - assert not bitwise_and(self.consensus_messages[epoch].prepare_bitmap[sighash][validator_index / 256], + assert not bitwise_and(self.consensus_messages[epoch].prepare_bitmap[sourcing_hash][validator_index / 256], shift(as_num256(1), validator_index % 256)) # Check that we are at least (epoch length / 4) blocks into the epoch # assert block.number % self.epoch_length >= self.epoch_length / 4 @@ -347,20 +351,19 @@ def prepare(validator_index: num, prepare_msg: bytes <= 1024): self.validators[validator_index].deposit += reward self.total_deposits[self.dynasty] += reward # Can't prepare for this epoch again - self.consensus_messages[epoch].prepare_bitmap[sighash][validator_index / 256] = \ - bitwise_or(self.consensus_messages[epoch].prepare_bitmap[sighash][validator_index / 256], + self.consensus_messages[epoch].prepare_bitmap[sourcing_hash][validator_index / 256] = \ + bitwise_or(self.consensus_messages[epoch].prepare_bitmap[sourcing_hash][validator_index / 256], shift(as_num256(1), validator_index % 256)) # self.validators[validator_index].max_prepared = epoch # Record that this prepare took place - new_ancestry_hash = sha3(concat(hash, ancestry_hash)) - curdyn_prepares = self.consensus_messages[epoch].prepares[sighash] + curdyn_prepares = self.consensus_messages[epoch].prepares[sourcing_hash] if in_current_dynasty: curdyn_prepares += this_validators_deposit - self.consensus_messages[epoch].prepares[sighash] = curdyn_prepares - prevdyn_prepares = self.consensus_messages[epoch].prev_dyn_prepares[sighash] + self.consensus_messages[epoch].prepares[sourcing_hash] = curdyn_prepares + prevdyn_prepares = self.consensus_messages[epoch].prev_dyn_prepares[sourcing_hash] if in_prev_dynasty: prevdyn_prepares += this_validators_deposit - self.consensus_messages[epoch].prev_dyn_prepares[sighash] = prevdyn_prepares + self.consensus_messages[epoch].prev_dyn_prepares[sourcing_hash] = prevdyn_prepares # If enough prepares with the same epoch_source and hash are made, # then the hash value is justified for commitment if (curdyn_prepares >= self.total_deposits[self.dynasty] * 2 / 3 and \ @@ -374,14 +377,15 @@ def prepare(validator_index: num, prepare_msg: bytes <= 1024): raw_log([self.prepare_log_topic], prepare_msg) # Process a commit message -def commit(validator_index: num, commit_msg: bytes <= 1024): +def commit(commit_msg: bytes <= 1024): sighash = extract32(raw_call(self.sighasher, commit_msg, gas=200000, outsize=32), 0) # Extract parameters - values = RLPList(commit_msg, [num, bytes32, num, bytes]) - epoch = values[0] - hash = values[1] - prev_commit_epoch = values[2] - sig = values[3] + values = RLPList(commit_msg, [num, num, bytes32, num, bytes]) + validator_index = values[0] + epoch = values[1] + hash = values[2] + prev_commit_epoch = values[3] + sig = values[4] # Check the signature assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash, sig), gas=500000, outsize=32), 0) == as_bytes32(1) # Check that we are in the right epoch @@ -421,18 +425,20 @@ def commit(validator_index: num, commit_msg: bytes <= 1024): raw_log([self.commit_log_topic], commit_msg) # Cannot make two prepares in the same epoch -def double_prepare_slash(validator_index: num, prepare1: bytes <= 1000, prepare2: bytes <= 1000): +def double_prepare_slash(prepare1: bytes <= 1000, prepare2: bytes <= 1000): # Get hash for signature, and implicitly assert that it is an RLP list # consisting solely of RLP elements sighash1 = extract32(raw_call(self.sighasher, prepare1, gas=200000, outsize=32), 0) sighash2 = extract32(raw_call(self.sighasher, prepare2, gas=200000, outsize=32), 0) # Extract parameters - values1 = RLPList(prepare1, [num, bytes32, bytes32, num, bytes32, bytes]) - values2 = RLPList(prepare2, [num, bytes32, bytes32, num, bytes32, bytes]) - epoch1 = values1[0] - sig1 = values1[5] - epoch2 = values2[0] - sig2 = values2[5] + values1 = RLPList(prepare1, [num, num, bytes32, bytes32, num, bytes32, bytes]) + values2 = RLPList(prepare2, [num, num, bytes32, bytes32, num, bytes32, bytes]) + validator_index = values1[0] + epoch1 = values1[1] + sig1 = values1[6] + assert validator_index == values2[0] + epoch2 = values2[1] + sig2 = values2[6] # Check the signatures assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash1, sig1), gas=500000, outsize=32), 0) == as_bytes32(1) assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash2, sig2), gas=500000, outsize=32), 0) == as_bytes32(1) @@ -447,24 +453,24 @@ def double_prepare_slash(validator_index: num, prepare1: bytes <= 1000, prepare2 self.total_deposits[self.dynasty] -= (validator_deposit - validator_deposit / 25) self.delete_validator(validator_index) -def prepare_commit_inconsistency_slash(validator_index: num, prepare_msg: bytes <= 1024, commit_msg: bytes <= 1024): +def prepare_commit_inconsistency_slash(prepare_msg: bytes <= 1024, commit_msg: bytes <= 1024): # Get hash for signature, and implicitly assert that it is an RLP list # consisting solely of RLP elements sighash1 = extract32(raw_call(self.sighasher, prepare_msg, gas=200000, outsize=32), 0) sighash2 = extract32(raw_call(self.sighasher, commit_msg, gas=200000, outsize=32), 0) # Extract parameters - values1 = RLPList(prepare_msg, [num, bytes32, bytes32, num, bytes32, bytes]) - values2 = RLPList(commit_msg, [num, bytes32, num, bytes]) - prepare_epoch = values1[0] - prepare_source_epoch = values1[3] - sig1 = values1[5] - commit_epoch = values2[0] - sig2 = values2[3] + values1 = RLPList(prepare_msg, [num, num, bytes32, bytes32, num, bytes32, bytes]) + values2 = RLPList(commit_msg, [num, num, bytes32, num, bytes]) + validator_index = values1[0] + prepare_epoch = values1[1] + prepare_source_epoch = values1[4] + sig1 = values1[6] + assert validator_index == values2[0] + commit_epoch = values2[1] + sig2 = values2[4] # Check the signatures assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash1, sig1), gas=500000, outsize=32), 0) == as_bytes32(1) assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash2, sig2), gas=500000, outsize=32), 0) == as_bytes32(1) - # Check that they're not the same message - assert sighash1 != sighash2 # Check that the prepare refers to something older than the commit assert prepare_source_epoch < commit_epoch # Check that the prepare is newer than the commit @@ -476,13 +482,14 @@ def prepare_commit_inconsistency_slash(validator_index: num, prepare_msg: bytes self.total_deposits[self.dynasty] -= validator_deposit self.delete_validator(validator_index) -def commit_non_justification_slash(validator_index: num, commit_msg: bytes <= 1024): +def commit_non_justification_slash(commit_msg: bytes <= 1024): sighash = extract32(raw_call(self.sighasher, commit_msg, gas=200000, outsize=32), 0) # Extract parameters - values = RLPList(commit_msg, [num, bytes32, num, bytes]) - epoch = values[0] - hash = values[1] - sig = values[3] + values = RLPList(commit_msg, [num, num, bytes32, num, bytes]) + validator_index = values[0] + epoch = values[1] + hash = values[2] + sig = values[4] # Check the signature assert len(sig) == 96 assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash, sig), gas=500000, outsize=32), 0) == as_bytes32(1) @@ -508,18 +515,19 @@ def derive_ancestry(oldest: bytes32, middle: bytes32, recent: bytes32): assert self.ancestry[oldest][middle] self.ancestry[oldest][recent] = self.ancestry[oldest][middle] + self.ancestry[middle][recent] -def prepare_non_justification_slash(validator_index: num, prepare_msg: bytes <= 1024) -> num: +def prepare_non_justification_slash(prepare_msg: bytes <= 1024) -> num: # Get hash for signature, and implicitly assert that it is an RLP list # consisting solely of RLP elements sighash = extract32(raw_call(self.sighasher, prepare_msg, gas=200000, outsize=32), 0) # Extract parameters - values = RLPList(prepare_msg, [num, bytes32, bytes32, num, bytes32, bytes]) - epoch = values[0] - hash = values[1] - ancestry_hash = values[2] - source_epoch = values[3] - source_ancestry_hash = values[4] - sig = values[5] + values = RLPList(prepare_msg, [num, num, bytes32, bytes32, num, bytes32, bytes]) + validator_index = values[0] + epoch = values[1] + hash = values[2] + ancestry_hash = values[3] + source_epoch = values[4] + source_ancestry_hash = values[5] + sig = values[6] # Check the signature assert extract32(raw_call(self.validators[validator_index].addr, concat(sighash, sig), gas=500000, outsize=32), 0) == as_bytes32(1) # Check that the view change is old enough diff --git a/casper4/simple_casper_tester.py b/casper4/simple_casper_tester.py index e0ec243..61433c3 100644 --- a/casper4/simple_casper_tester.py +++ b/casper4/simple_casper_tester.py @@ -64,23 +64,23 @@ print('Gas consumed to launch Casper', s.state.receipts[-1].gas_used - s.state.r # Helper functions for making a prepare, commit, login and logout message -def mk_prepare(epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash, key): - sighash = utils.sha3(rlp.encode([epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash])) +def mk_prepare(validator_index, epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash, key): + sighash = utils.sha3(rlp.encode([validator_index, epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash])) v, r, s = utils.ecdsa_raw_sign(sighash, key) sig = utils.encode_int32(v) + utils.encode_int32(r) + utils.encode_int32(s) - return rlp.encode([epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash, sig]) + return rlp.encode([validator_index, epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash, sig]) -def mk_commit(epoch, hash, prev_commit_epoch, key): - sighash = utils.sha3(rlp.encode([epoch, hash, prev_commit_epoch])) +def mk_commit(validator_index, epoch, hash, prev_commit_epoch, key): + sighash = utils.sha3(rlp.encode([validator_index, epoch, hash, prev_commit_epoch])) v, r, s = utils.ecdsa_raw_sign(sighash, key) sig = utils.encode_int32(v) + utils.encode_int32(r) + utils.encode_int32(s) - return rlp.encode([epoch, hash, prev_commit_epoch, sig]) + return rlp.encode([validator_index, epoch, hash, prev_commit_epoch, sig]) -def mk_status_flicker(epoch, login, key): - sighash = utils.sha3(rlp.encode([epoch, login])) +def mk_status_flicker(validator_index, epoch, login, key): + sighash = utils.sha3(rlp.encode([validator_index, epoch, login])) v, r, s = utils.ecdsa_raw_sign(sighash, key) sig = utils.encode_int32(v) + utils.encode_int32(r) + utils.encode_int32(s) - return rlp.encode([epoch, login, sig]) + return rlp.encode([validator_index, epoch, login, sig]) # Begin the test @@ -95,7 +95,7 @@ print("Epoch initialized") print("Reward factor: %.8f" % (casper.get_reward_factor() * 2 / 3)) # Send a prepare message #configure_logging(config_string=config_string) -casper.prepare(0, mk_prepare(1, '\x35' * 32, '\x00' * 32, 0, '\x00' * 32, t.k0)) +casper.prepare(mk_prepare(0, 1, '\x35' * 32, '\x00' * 32, 0, '\x00' * 32, t.k0)) print('Gas consumed for a prepare: %d (including %d intrinsic gas)' % (s.state.receipts[-1].gas_used - s.state.receipts[-2].gas_used, s.last_tx.intrinsic_gas_used)) epoch_1_anchash = utils.sha3(b'\x35' * 32 + b'\x00' * 32) @@ -103,14 +103,14 @@ assert casper.get_consensus_messages__hash_justified(1, b'\x35' * 32) assert casper.get_consensus_messages__ancestry_hash_justified(1, epoch_1_anchash) print("Prepare message processed") try: - casper.prepare(0, mk_prepare(1, '\x35' * 32, '\x00' * 32, 0, '\x00' * 32, t.k0)) + casper.prepare(mk_prepare(0, 1, '\x35' * 32, '\x00' * 32, 0, '\x00' * 32, t.k0)) success = True except: success = False assert not success print("Prepare message fails the second time") # Send a commit message -casper.commit(0, mk_commit(1, '\x35' * 32, 0, t.k0)) +casper.commit(mk_commit(0, 1, '\x35' * 32, 0, t.k0)) print('Gas consumed for a commit: %d (including %d intrinsic gas)' % (s.state.receipts[-1].gas_used - s.state.receipts[-2].gas_used, s.last_tx.intrinsic_gas_used)) # Check that we committed @@ -124,10 +124,10 @@ assert casper.get_dynasty() == 1 assert casper.get_total_deposits(1) == casper.get_total_deposits(0) > 0 print("Second epoch initialized, dynasty increased as expected") # Send a prepare message -casper.prepare(0, mk_prepare(2, '\x45' * 32, epoch_1_anchash, 1, epoch_1_anchash, t.k0)) +casper.prepare(mk_prepare(0, 2, '\x45' * 32, epoch_1_anchash, 1, epoch_1_anchash, t.k0)) # Send a commit message -epoch_2_commit = mk_commit(2, '\x45' * 32, 1, t.k0) -casper.commit(0, epoch_2_commit) +epoch_2_commit = mk_commit(0, 2, '\x45' * 32, 1, t.k0) +casper.commit(epoch_2_commit) epoch_2_anchash = utils.sha3(b'\x45' * 32 + epoch_1_anchash) assert casper.get_consensus_messages__ancestry_hash_justified(2, epoch_2_anchash) # Check that we committed @@ -137,21 +137,21 @@ s.state.block_number += EPOCH_LENGTH casper.initialize_epoch(3) print("Second epoch prepared and committed, third epoch initialized") # Test the NO_DBL_PREPARE slashing condition -p1 = mk_prepare(3, '\x56' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0) -p2 = mk_prepare(3, '\x57' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0) +p1 = mk_prepare(0, 3, '\x56' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0) +p2 = mk_prepare(0, 3, '\x57' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0) snapshot = s.snapshot() -casper.double_prepare_slash(0, p1, p2) +casper.double_prepare_slash(p1, p2) s.revert(snapshot) print("NO_DBL_PREPARE slashing condition works") # Test the PREPARE_COMMIT_CONSISTENCY slashing condition -p3 = mk_prepare(3, '\x58' * 32, epoch_2_anchash, 0, b'\x00' * 32, t.k0) +p3 = mk_prepare(0, 3, '\x58' * 32, epoch_2_anchash, 0, b'\x00' * 32, t.k0) snapshot = s.snapshot() -casper.prepare_commit_inconsistency_slash(0, p3, epoch_2_commit) +casper.prepare_commit_inconsistency_slash(p3, epoch_2_commit) s.revert(snapshot) print("PREPARE_COMMIT_CONSISTENCY slashing condition works") # Finish the third epoch -casper.prepare(0, p1) -casper.commit(0, mk_commit(3, '\x56' * 32, 2, t.k0)) +casper.prepare(p1) +casper.commit(mk_commit(0, 3, '\x56' * 32, 2, t.k0)) epoch_3_anchash = utils.sha3(b'\x56' * 32 + epoch_2_anchash) assert casper.get_consensus_messages__ancestry_hash_justified(3, epoch_3_anchash) assert casper.get_consensus_messages__committed(3) @@ -161,7 +161,7 @@ casper.initialize_epoch(4) assert casper.get_dynasty() == 3 epoch_4_anchash = utils.sha3(b'\x67' * 32 + epoch_3_anchash) # Not publishing this prepare for the time being -p4 = mk_prepare(4, '\x78' * 32, '\x12' * 32, 3, '\x24' * 32, t.k0) +p4 = mk_prepare(0, 4, '\x78' * 32, '\x12' * 32, 3, '\x24' * 32, t.k0) # Initialize the fifth epoch s.state.block_number += EPOCH_LENGTH casper.initialize_epoch(5) @@ -169,10 +169,10 @@ print("Epochs up to 5 initialized") # Dynasty not incremented because no commits were made assert casper.get_dynasty() == 3 epoch_5_anchash = utils.sha3(b'\x78' * 32 + epoch_4_anchash) -p5 = mk_prepare(5, '\x78' * 32, epoch_4_anchash, 3, epoch_3_anchash, t.k0) -casper.prepare(0, p5) +p5 = mk_prepare(0, 5, '\x78' * 32, epoch_4_anchash, 3, epoch_3_anchash, t.k0) +casper.prepare(p5) # Test the COMMIT_REQ slashing condition -kommit = mk_commit(5, b'\x80' * 32, 3, t.k0) +kommit = mk_commit(0, 5, b'\x80' * 32, 3, t.k0) epoch_inc = 1 + int(86400 / 14 / EPOCH_LENGTH) s.state.block_number += EPOCH_LENGTH * epoch_inc print("Speeding up time to test remaining two slashing conditions") @@ -180,7 +180,7 @@ for i in range(6, 6 + epoch_inc): casper.initialize_epoch(i) print("Epochs up to %d initialized" % (6 + epoch_inc)) snapshot = s.snapshot() -casper.commit_non_justification_slash(0, kommit) +casper.commit_non_justification_slash(kommit) s.revert(snapshot) try: casper.commit_non_justification_slash(0, epoch_2_commit) @@ -196,10 +196,10 @@ assert casper.get_ancestry(epoch_4_anchash, epoch_5_anchash) == 1 casper.derive_ancestry(epoch_3_anchash, epoch_4_anchash, epoch_5_anchash) assert casper.get_ancestry(epoch_3_anchash, epoch_5_anchash) == 2 snapshot = s.snapshot() -casper.prepare_non_justification_slash(0, p4) +casper.prepare_non_justification_slash(p4) s.revert(snapshot) try: - casper.prepare_non_justification_slash(0, p5) + casper.prepare_non_justification_slash(p5) success = True except: success = False @@ -218,8 +218,8 @@ for k in (t.k1, t.k2, t.k3, t.k4, t.k5, t.k6): assert utils.big_endian_to_int(s.send(t.k0, purity_checker_address, 0, ct.encode('submit', [valcode_addr]))) == 1 casper.deposit(valcode_addr, utils.privtoaddr(k), value=3 * 10**18) print("Processed 6 deposits") -casper.prepare(0, mk_prepare(1, b'\x10' * 32, b'\x00' * 32, 0, b'\x00' * 32, t.k0)) -casper.commit(0, mk_commit(1, b'\x10' * 32, 0, t.k0)) +casper.prepare(mk_prepare(0, 1, b'\x10' * 32, b'\x00' * 32, 0, b'\x00' * 32, t.k0)) +casper.commit(mk_commit(0, 1, b'\x10' * 32, 0, t.k0)) epoch_1_anchash = utils.sha3(b'\x10' * 32 + b'\x00' * 32) assert casper.get_consensus_messages__committed(1) print("Prepared and committed") @@ -227,8 +227,8 @@ s.state.block_number += EPOCH_LENGTH casper.initialize_epoch(2) print("Epoch 2 initialized") assert casper.get_dynasty() == 1 -casper.prepare(0, mk_prepare(2, b'\x20' * 32, epoch_1_anchash, 1, epoch_1_anchash, t.k0)) -casper.commit(0, mk_commit(2, b'\x20' * 32, 1, t.k0)) +casper.prepare(mk_prepare(0, 2, b'\x20' * 32, epoch_1_anchash, 1, epoch_1_anchash, t.k0)) +casper.commit(mk_commit(0, 2, b'\x20' * 32, 1, t.k0)) epoch_2_anchash = utils.sha3(b'\x20' * 32 + epoch_1_anchash) assert casper.get_consensus_messages__committed(2) print("Confirmed that one key is still sufficient to prepare and commit") @@ -242,38 +242,38 @@ assert 21 * 10**18 <= casper.get_total_deposits(2) < 22 * 10**18 print("Confirmed new total_deposits") try: # Try to log out, but sign with the wrong key - casper.flick_status(0, mk_status_flicker(3, 0, t.k1)) + casper.flick_status(mk_status_flicker(0, 3, 0, t.k1)) success = True except: success = False assert not success # Log out -casper.flick_status(4, mk_status_flicker(3, 0, t.k4)) -casper.flick_status(5, mk_status_flicker(3, 0, t.k5)) -casper.flick_status(6, mk_status_flicker(3, 0, t.k6)) +casper.flick_status(mk_status_flicker(4, 3, 0, t.k4)) +casper.flick_status(mk_status_flicker(5, 3, 0, t.k5)) +casper.flick_status(mk_status_flicker(6, 3, 0, t.k6)) print("Logged out three validators") # Validators leave the fwd validator set in dynasty 4 assert casper.get_validators__dynasty_end(4) == 4 epoch_3_anchash = utils.sha3(b'\x30' * 32 + epoch_2_anchash) # Prepare from one validator -casper.prepare(0, mk_prepare(3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0)) +casper.prepare(mk_prepare(0, 3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k0)) # Not prepared yet assert not casper.get_consensus_messages__hash_justified(3, b'\x30' * 32) print("Prepare from one validator no longer sufficient") # Prepare from 3 more validators for i, k in ((1, t.k1), (2, t.k2), (3, t.k3)): - casper.prepare(i, mk_prepare(3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, k)) + casper.prepare(mk_prepare(i, 3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, k)) # Still not prepared assert not casper.get_consensus_messages__hash_justified(3, b'\x30' * 32) print("Prepare from four of seven validators still not sufficient") # Prepare from a fifth validator -casper.prepare(4, mk_prepare(3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k4)) +casper.prepare(mk_prepare(4, 3, b'\x30' * 32, epoch_2_anchash, 2, epoch_2_anchash, t.k4)) # NOW we're prepared! assert casper.get_consensus_messages__hash_justified(3, b'\x30' * 32) print("Prepare from five of seven validators sufficient!") # Five commits for i, k in enumerate([t.k0, t.k1, t.k2, t.k3, t.k4]): - casper.commit(i, mk_commit(3, b'\x30' * 32, 2 if i == 0 else 0, k)) + casper.commit(mk_commit(i, 3, b'\x30' * 32, 2 if i == 0 else 0, k)) # And we committed! assert casper.get_consensus_messages__committed(3) print("Commit from five of seven validators sufficient") @@ -285,9 +285,9 @@ print("Epoch 4 initialized") # Prepare and commit epoch_4_anchash = utils.sha3(b'\x40' * 32 + epoch_3_anchash) for i, k in enumerate([t.k0, t.k1, t.k2, t.k3, t.k4]): - casper.prepare(i, mk_prepare(4, b'\x40' * 32, epoch_3_anchash, 3, epoch_3_anchash, k)) + casper.prepare(mk_prepare(i, 4, b'\x40' * 32, epoch_3_anchash, 3, epoch_3_anchash, k)) for i, k in enumerate([t.k0, t.k1, t.k2, t.k3, t.k4]): - casper.commit(i, mk_commit(4, b'\x40' * 32, 3, k)) + casper.commit(mk_commit(i, 4, b'\x40' * 32, 3, k)) assert casper.get_consensus_messages__committed(4) print("Prepared and committed") # Start epoch 5 / dynasty 4 @@ -300,18 +300,18 @@ assert 12 * 10**18 <= casper.get_total_deposits(4) <= 13 * 10**18 epoch_5_anchash = utils.sha3(b'\x50' * 32 + epoch_4_anchash) # Do three prepares for i, k in enumerate([t.k0, t.k1, t.k2]): - casper.prepare(i, mk_prepare(5, b'\x50' * 32, epoch_4_anchash, 4, epoch_4_anchash, k)) + casper.prepare(mk_prepare(i, 5, b'\x50' * 32, epoch_4_anchash, 4, epoch_4_anchash, k)) # Three prepares are insufficient because there are still five validators in the rear validator set assert not casper.get_consensus_messages__hash_justified(5, b'\x50' * 32) print("Three prepares insufficient, as rear validator set still has seven") # Do two more prepares for i, k in [(3, t.k3), (4, t.k4)]: - casper.prepare(i, mk_prepare(5, b'\x50' * 32, epoch_4_anchash, 4, epoch_4_anchash, k)) + casper.prepare(mk_prepare(i, 5, b'\x50' * 32, epoch_4_anchash, 4, epoch_4_anchash, k)) # Now we're good! assert casper.get_consensus_messages__hash_justified(5, b'\x50' * 32) print("Five prepares sufficient") for i, k in enumerate([t.k0, t.k1, t.k2, t.k3, t.k4]): - casper.commit(i, mk_commit(5, b'\x50' * 32, 4, k)) + casper.commit(mk_commit(i, 5, b'\x50' * 32, 4, k)) # Committed! assert casper.get_consensus_messages__committed(5) # Start epoch 6 / dynasty 5 @@ -329,7 +329,7 @@ old_deposit = casper.get_validators__deposit(4) # * During dynasty 2, the validator logs off, so he leaves the current set in dynasty 4 # (epoch 5) and the previous set in dynasty 5 (epoch 6) assert [casper.check_eligible_in_epoch(4, i) for i in range(7)] == [0, 0, 0, 2, 3, 1, 0] -casper.flick_status(4, mk_status_flicker(6, 1, t.k4)) +casper.flick_status(mk_status_flicker(4, 6, 1, t.k4)) # Explanation: # * During dynasty 7, the validator will log on again. Hence, the dynasty mask # should include dynasties 4, 5, 6 @@ -341,9 +341,9 @@ assert casper.get_validators__dynasty_start(4) == 7 # Here three prepares and three commits should be sufficient! epoch_6_anchash = utils.sha3(b'\x60' * 32 + epoch_5_anchash) for i, k in enumerate([t.k0, t.k1, t.k2]): - casper.prepare(i, mk_prepare(6, b'\x60' * 32, epoch_5_anchash, 5, epoch_5_anchash, k)) + casper.prepare(mk_prepare(i, 6, b'\x60' * 32, epoch_5_anchash, 5, epoch_5_anchash, k)) for i, k in enumerate([t.k0, t.k1, t.k2]): - casper.commit(i, mk_commit(6, b'\x60' * 32, 5, k)) + casper.commit(mk_commit(i, 6, b'\x60' * 32, 5, k)) assert casper.get_consensus_messages__committed(6) print("Three of four prepares and commits sufficient") # Start epoch 7 / dynasty 6 @@ -356,7 +356,7 @@ epoch_7_anchash = utils.sha3(b'\x70' * 32 + epoch_6_anchash) for i, k in enumerate([t.k0, t.k1, t.k2]): #if i == 1: # configure_logging(config_string=config_string) - casper.prepare(i, mk_prepare(7, b'\x70' * 32, epoch_6_anchash, 6, epoch_6_anchash, k)) + casper.prepare(mk_prepare(i, 7, b'\x70' * 32, epoch_6_anchash, 6, epoch_6_anchash, k)) #if i == 1: # import sys # sys.exit() @@ -364,7 +364,7 @@ print('Gas consumed for first prepare', s.state.receipts[-1].gas_used - s.state. print('Gas consumed for second prepare', s.state.receipts[-2].gas_used - s.state.receipts[-3].gas_used) print('Gas consumed for third prepare', s.state.receipts[-3].gas_used - s.state.receipts[-4].gas_used) for i, k in enumerate([t.k0, t.k1, t.k2]): - casper.commit(i, mk_commit(7, b'\x70' * 32, 6, k)) + casper.commit(mk_commit(i, 7, b'\x70' * 32, 6, k)) print('Gas consumed for first commit', s.state.receipts[-1].gas_used - s.state.receipts[-2].gas_used) print('Gas consumed for second commit', s.state.receipts[-2].gas_used - s.state.receipts[-3].gas_used) print('Gas consumed for third commit', s.state.receipts[-3].gas_used - s.state.receipts[-4].gas_used) @@ -380,18 +380,18 @@ assert 15 * 10**18 <= casper.get_total_deposits(7) <= 16 * 10**18 epoch_8_anchash = utils.sha3(b'\x80' * 32 + epoch_7_anchash) # Do three prepares for i, k in enumerate([t.k0, t.k1, t.k2]): - casper.prepare(i, mk_prepare(8, b'\x80' * 32, epoch_7_anchash, 7, epoch_7_anchash, k)) + casper.prepare(mk_prepare(i, 8, b'\x80' * 32, epoch_7_anchash, 7, epoch_7_anchash, k)) # Three prepares are insufficient because there are still five validators in the rear validator set assert not casper.get_consensus_messages__hash_justified(8, b'\x80' * 32) print("Three prepares no longer sufficient, as the forward validator set has five validators") # Do one more prepare for i, k in [(3, t.k3)]: - casper.prepare(i, mk_prepare(8, b'\x80' * 32, epoch_7_anchash, 7, epoch_7_anchash, k)) + casper.prepare(mk_prepare(i, 8, b'\x80' * 32, epoch_7_anchash, 7, epoch_7_anchash, k)) # Now we're good! assert casper.get_consensus_messages__hash_justified(8, b'\x80' * 32) print("Four of five prepares sufficient") for i, k in enumerate([t.k0, t.k1, t.k2, t.k3, t.k4]): - casper.commit(i, mk_commit(8, b'\x80' * 32, 7 if i < 3 else 5, k)) + casper.commit(mk_commit(i, 8, b'\x80' * 32, 7 if i < 3 else 5, k)) assert casper.get_consensus_messages__committed(8) print("Committed") # Validator rejoins current validator set in epoch 8