balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mutisig v2 some renaming and counter reset fix

Browse Source
This commit is contained in:
Lesenechal Remi 2019-11-26 19:21:51 +01:00
parent 39c7766b08
commit e7195c4c41
2 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/contracts/multisig-v2.ligo
View File

@ -5,16 +5,16 @@ type max_message_size_t is nat
type state_hash_t is bytes
type addr_set_t is set(address)
type message_store_t is map(bytes,addr_set_t)
type counter_store_t is map(address,nat)
type proposal_counters_t is map(address,nat)
type storage_t is record
state_hash : state_hash_t ;
threshold : threshold_t ;
max_proposal : max_proposal_t ;
max_message_size : max_message_size_t ;
auth : addr_set_t ;
authorized_addresses : addr_set_t ;
message_store : message_store_t ;
counter_store : counter_store_t ;
proposal_counters : proposal_counters_t ;
end
// I/O types
@ -34,7 +34,7 @@ type entry_point_t is
function send (const param : send_pt; const s : storage_t) : contract_return_t is block {
// check sender against the authorized addresses
if not set_mem(sender,s.auth) then failwith("Unauthorized address") else skip ;
if not set_mem(sender,s.authorized_addresses) then failwith("Unauthorized address") else skip ;
// check message size against the stored limit
var message : message_t := param ;
@ -48,18 +48,18 @@ function send (const param : send_pt; const s : storage_t) : contract_return_t i
| Some(voters) -> block { // the message is already stored
// increment the counter only if the sender isn't already associated with the message
if set_mem(sender,voters) then skip
else s.counter_store[sender] := get_force(sender,s.counter_store) + 1n ;
else s.proposal_counters[sender] := get_force(sender,s.proposal_counters) + 1n ;
new_store := set_add(sender,voters)
}
| None -> block { // the message has never been received before
s.counter_store[sender] := get_force(sender,s.counter_store) + 1n ;
s.proposal_counters[sender] := get_force(sender,s.proposal_counters) + 1n ;
new_store := set [sender];
}
end ;
// check sender counters against the maximum number of proposal
var sender_proposal_counter : nat := get_force(sender,s.counter_store) ;
var sender_proposal_counter : nat := get_force(sender,s.proposal_counters) ;
if sender_proposal_counter > s.max_proposal then failwith("Maximum number of proposal reached")
else skip ;
@ -70,8 +70,12 @@ function send (const param : send_pt; const s : storage_t) : contract_return_t i
ret_ops := message(s.state_hash) ;
// update the state hash
s.state_hash := sha_256 ( bytes_concat (s.state_hash , packed_msg) ) ;
// reset the counter
s.counter_store[sender] := abs (sender_proposal_counter - 1n) ;
// decrement the counters
for addr -> ctr in map s.proposal_counters block {
if set_mem(addr,new_store) then
s.proposal_counters[addr] := abs (ctr - 1n)
else skip ;
}
} else
s.message_store[packed_msg] := new_store
@ -88,7 +92,7 @@ function withdraw (const param : withdraw_pt; const s : storage_t) : contract_re
// decrement the counter only if the sender was already associated with the message
if size(voters) =/= size(new_set) then
s.counter_store[sender] := abs (get_force(sender,s.counter_store) - 1n)
s.proposal_counters[sender] := abs (get_force(sender,s.proposal_counters) - 1n)
else skip ;
// if the message is left without any associated addresses, remove the corresponding message_store field

38
src/test/multisig_v2_tests.ml
View File

@ -50,13 +50,13 @@ let storage {state_hash ; threshold ; max_proposal ; max_msg_size ; id_counter_l
([],[])
id_counter_list in
e_ez_record [
("state_hash" , e_bytes_ofbytes state_hash ) ;
("threshold" , e_nat threshold ) ;
("max_proposal" , e_nat max_proposal ) ;
("max_message_size", e_nat max_msg_size ) ;
("auth" , e_typed_set auth_set t_address ) ;
("message_store" , e_typed_map msg_store_list t_bytes (t_set t_address) ) ;
("counter_store" , e_typed_map counter_store t_address t_nat ) ;
("state_hash" , e_bytes_ofbytes state_hash ) ;
("threshold" , e_nat threshold ) ;
("max_proposal" , e_nat max_proposal ) ;
("max_message_size" , e_nat max_msg_size ) ;
("authorized_addresses", e_typed_set auth_set t_address ) ;
("message_store" , e_typed_map msg_store_list t_bytes (t_set t_address) ) ;
("proposal_counters" , e_typed_map counter_store t_address t_nat ) ;
]
(* sender not stored in the authorized set *)
@ -188,6 +188,29 @@ let withdraw_already_accounted_two () =
expect_eq ~options program "main"
(e_pair param init_storage) (e_pair empty_op_list final_storage)
(* triggers the threshold and check that all the participants get their counters decremented *)
let counters_reset () =
let%bind program,_ = get_program () in
let%bind packed_payload = pack_payload program empty_message in
let bytes = e_bytes_ofbytes packed_payload in
let param = send_param empty_message in
let hash_after_msg = sha_256_hash (Bytes.concat Bytes.empty [Bytes.empty ; packed_payload]) in
let init_storage' = {
threshold = 3 ; max_proposal = 2 ; max_msg_size = 15 ; state_hash = Bytes.empty ;
id_counter_list = [1,1 ; 2,1 ; 3,0] ;
msg_store_list = [(bytes, e_set [e_address@@ addr 1; e_address@@ addr 2])] ;
} in
let init_storage = storage init_storage' in
let final_storage = storage { init_storage' with
state_hash = hash_after_msg ;
id_counter_list = [1,0 ; 2,0 ; 3,0] ;
msg_store_list = [] } in
let options =
let source = contract 3 in
Proto_alpha_utils.Memory_proto_alpha.make_options ~source () in
expect_eq ~options program "main"
(e_pair param init_storage) (e_pair empty_op_list final_storage)
(* sender withdraw message was never accounted *)
let withdraw_never_accounted () =
let%bind program,_ = get_program () in
@ -245,4 +268,5 @@ let main = test_suite "Multisig v2" [
test "succeeded_storing" succeeded_storing ;
test "withdraw_already_accounted_one" withdraw_already_accounted_one ;
test "withdraw_already_accounted_two" withdraw_already_accounted_two ;
test "counters_reset" counters_reset ;
]