status-im
/
research
mirror of https://github.com/status-im/research.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added logout/login feature

This commit is contained in:
vub 2017-03-23 01:18:15 -04:00
parent addeda54cb
commit 821e2e3be2
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
casper4/simple_casper.v.py
View File

@ -1,5 +1,5 @@
# Information about validators # Information about validators
validators: public({ validators: {
# Amount of wei the validator holds # Amount of wei the validator holds
deposit: wei_value, deposit: wei_value,
# The dynasty the validator is joining # The dynasty the validator is joining
@ -7,7 +7,7 @@ validators: public({
# The dynasty the validator is leaving # The dynasty the validator is leaving
dynasty_end: num, dynasty_end: num,
# The timestamp at which the validator can withdraw # The timestamp at which the validator can withdraw
withdrawal_time: timestamp, withdrawal_epoch: num,
# The address which the validator's signatures must verify to (to be later replaced with validation code) # The address which the validator's signatures must verify to (to be later replaced with validation code)
addr: address, addr: address,
# Addess to withdraw to # Addess to withdraw to
@ -16,7 +16,7 @@ validators: public({
max_prepared: num, max_prepared: num,
# The max epoch at which the validator committed # The max epoch at which the validator committed
max_committed: num max_committed: num
}[num]) }[num]
# The current dynasty (validator set changes between dynasties) # The current dynasty (validator set changes between dynasties)
dynasty: public(num) dynasty: public(num)
@ -95,7 +95,7 @@ def __init__():
deposit: as_wei_value(3, finney), deposit: as_wei_value(3, finney),
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 1000000000000000000000000000000, dynasty_end: 1000000000000000000000000000000,
withdrawal_time: 1000000000000000000000000000000, withdrawal_epoch: 1000000000000000000000000000000,
addr: 0x1db3439a222c519ab44bb1144fc28167b4fa6ee6, addr: 0x1db3439a222c519ab44bb1144fc28167b4fa6ee6,
withdrawal_addr: 0x1db3439a222c519ab44bb1144fc28167b4fa6ee6, withdrawal_addr: 0x1db3439a222c519ab44bb1144fc28167b4fa6ee6,
max_prepared: 0, max_prepared: 0,
@ -127,7 +127,7 @@ def deposit(validation_addr: address, withdrawal_addr: address):
deposit: msg.value, deposit: msg.value,
dynasty_start: self.dynasty + 2, dynasty_start: self.dynasty + 2,
dynasty_end: 1000000000000000000000000000000, dynasty_end: 1000000000000000000000000000000,
withdrawal_time: 1000000000000000000000000000000, withdrawal_epoch: 1000000000000000000000000000000,
addr: validation_addr, addr: validation_addr,
withdrawal_addr: withdrawal_addr, withdrawal_addr: withdrawal_addr,
max_prepared: 0, max_prepared: 0,
@ -136,34 +136,51 @@ def deposit(validation_addr: address, withdrawal_addr: address):
self.nextValidatorIndex += 1 self.nextValidatorIndex += 1
self.second_next_dynasty_wei_delta += msg.value self.second_next_dynasty_wei_delta += msg.value
# Exit the validator set, and start the withdrawal procedure # Exit the validator set. A logged out validator can log back in later, or
def start_withdrawal(index: num, sig: bytes <= 96): # if they do not log in for an entire withdrawal period, they can get their
# money out
def logout(validator_index: num, sig: bytes <= 96):
assert self.current_epoch == block.number / self.epoch_length assert self.current_epoch == block.number / self.epoch_length
# Signature check # Signature check
assert len(sig) == 96 assert len(sig) == 96
assert ecrecover(sha3("withdraw"), assert ecrecover(sha3("withdraw"),
as_num256(extract32(sig, 0)), as_num256(extract32(sig, 0)),
as_num256(extract32(sig, 32)), as_num256(extract32(sig, 32)),
as_num256(extract32(sig, 64))) == self.validators[index].addr as_num256(extract32(sig, 64))) == self.validators[validator_index].addr
# Check that we haven't already withdrawn # Check that we haven't already withdrawn
assert self.validators[index].dynasty_end >= self.dynasty + 2 assert self.validators[validator_index].dynasty_end >= self.dynasty + 2
# Set the end dynasty # Set the end dynasty
self.validators[index].dynasty_end = self.dynasty + 2 self.validators[validator_index].dynasty_end = self.dynasty + 2
self.second_next_dynasty_wei_delta -= msg.value self.second_next_dynasty_wei_delta -= self.validators[validator_index].deposit
# Set the withdrawal date # Set the withdrawal date
#self.validators[index].withdrawal_time = block.timestamp + self.withdrawal_delay self.validators[validator_index].withdrawal_epoch = self.current_epoch + self.withdrawal_delay / self.block_time / self.epoch_length
# Log back in
def login(validator_index: num, sig: bytes <= 96):
assert self.current_epoch == block.number / self.epoch_length
# Signature check
assert len(sig) == 96
assert ecrecover(sha3("withdraw"),
as_num256(extract32(sig, 0)),
as_num256(extract32(sig, 32)),
as_num256(extract32(sig, 64))) == self.validators[validator_index].addr
# Check that we are logged out
assert self.validators[validator_index].dynasty_end < self.dynasty
self.validators[validator_index].dynasty_start = self.dynasty + 2
self.validators[validator_index].dynasty_end = 1000000000000000000000000000000
self.second_next_dynasty_wei_delta += self.validators[validator_index].deposit
# Withdraw deposited ether # Withdraw deposited ether
def withdraw(index: num): def withdraw(validator_index: num):
# Check that we can withdraw # Check that we can withdraw
#assert block.timestamp >= self.validators[index].withdrawal_time assert self.current_epoch >= self.validators[validator_index].withdrawal_epoch
# Withdraw # Withdraw
send(self.validators[index].withdrawal_addr, self.validators[index].deposit) send(self.validators[validator_index].withdrawal_addr, self.validators[validator_index].deposit)
self.validators[index] = { self.validators[validator_index] = {
deposit: 0, deposit: 0,
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 0, dynasty_end: 0,
withdrawal_time: 0, withdrawal_epoch: 0,
addr: None, addr: None,
withdrawal_addr: None, withdrawal_addr: None,
max_prepared: 0, max_prepared: 0,
@ -308,7 +325,7 @@ def double_prepare_slash(validator_index: num, prepare1: bytes <= 1000, prepare2
deposit: 0, deposit: 0,
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 0, dynasty_end: 0,
withdrawal_time: 0, withdrawal_epoch: 0,
addr: None, addr: None,
withdrawal_addr: None, withdrawal_addr: None,
max_prepared: 0, max_prepared: 0,
@ -352,7 +369,7 @@ def prepare_commit_inconsistency_slash(validator_index: num, prepare_msg: bytes
deposit: 0, deposit: 0,
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 0, dynasty_end: 0,
withdrawal_time: 0, withdrawal_epoch: 0,
addr: None, addr: None,
withdrawal_addr: None, withdrawal_addr: None,
max_prepared: 0, max_prepared: 0,
@ -385,7 +402,7 @@ def commit_non_justification_slash(validator_index: num, commit_msg: bytes <= 10
deposit: 0, deposit: 0,
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 0, dynasty_end: 0,
withdrawal_time: 0, withdrawal_epoch: 0,
addr: None, addr: None,
withdrawal_addr: None, withdrawal_addr: None,
max_prepared: 0, max_prepared: 0,
@ -429,7 +446,7 @@ def prepare_non_justification_slash(validator_index: num, prepare_msg: bytes <=
deposit: 0, deposit: 0,
dynasty_start: 0, dynasty_start: 0,
dynasty_end: 0, dynasty_end: 0,
withdrawal_time: 0, withdrawal_epoch: 0,
addr: None, addr: None,
withdrawal_addr: None, withdrawal_addr: None,
max_prepared: 0, max_prepared: 0,

7
casper4/simple_casper_tester.py
View File

@ -24,13 +24,12 @@ sighasher = s.contract(open('sighash.se.py').read(), language='serpent')
casper_code = open('simple_casper.v.py').read().replace('0x1db3439a222c519ab44bb1144fc28167b4fa6ee6', '0x'+utils.encode_hex(t.a0)) \ casper_code = open('simple_casper.v.py').read().replace('0x1db3439a222c519ab44bb1144fc28167b4fa6ee6', '0x'+utils.encode_hex(t.a0)) \
.replace('0x38920146f10f3956fc09970beededcb2d9638712', '0x'+utils.encode_hex(sighasher)) .replace('0x38920146f10f3956fc09970beededcb2d9638712', '0x'+utils.encode_hex(sighasher))
print(casper_code) print('Casper code length', len(compiler.compile(casper_code)))
print(utils.encode_hex(sighasher))
print(len(compiler.compile(casper_code)))
casper = s.abi_contract(casper_code, language='viper', startgas=5555555) casper = s.abi_contract(casper_code, language='viper', startgas=5555555)
print('Gas consumed', s.state.receipts[-1].gas_used - s.state.receipts[-2].gas_used)
def mk_prepare(epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash, key): 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])) sighash = utils.sha3(rlp.encode([epoch, hash, ancestry_hash, source_epoch, source_ancestry_hash]))
v, r, s = utils.ecdsa_raw_sign(sighash, key) v, r, s = utils.ecdsa_raw_sign(sighash, key)