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

Initialize Paid and used storage for contracts without code

Browse Source
This commit is contained in:
Pierre Chambart 2018-06-23 03:20:22 +02:00
parent 455012d4e9
commit 7b770c52d5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/proto_alpha/lib_protocol/src/contract_storage.ml
View File

@ -205,7 +205,9 @@ let create_base c contract
~balance ~manager ~delegate ?script ~spendable ~delegatable = ~balance ~manager ~delegate ?script ~spendable ~delegatable =
(match Contract_repr.is_implicit contract with (match Contract_repr.is_implicit contract with
| None -> return Z.zero | None -> return Z.zero
| Some _ -> Storage.Contract.Global_counter.get c) >>=? fun counter -> | Some _ ->
Storage.Contract.Paid_storage_space.init c contract Z.zero >>=? fun c ->
Storage.Contract.Global_counter.get c) >>=? fun counter ->
Storage.Contract.Balance.init c contract balance >>=? fun c -> Storage.Contract.Balance.init c contract balance >>=? fun c ->
Storage.Contract.Manager.init c contract (Manager_repr.Hash manager) >>=? fun c -> Storage.Contract.Manager.init c contract (Manager_repr.Hash manager) >>=? fun c ->
begin begin
@ -224,9 +226,14 @@ let create_base c contract
update_script_big_map c contract big_map_diff >>=? fun (c, big_map_size) -> update_script_big_map c contract big_map_diff >>=? fun (c, big_map_size) ->
let total_size = Z.add (Z.add (Z.of_int code_size) (Z.of_int storage_size)) big_map_size in let total_size = Z.add (Z.add (Z.of_int code_size) (Z.of_int storage_size)) big_map_size in
assert Compare.Z.(total_size >= Z.zero) ; assert Compare.Z.(total_size >= Z.zero) ;
Storage.Contract.Used_storage_space.init c contract total_size >>=? fun c -> Storage.Contract.Used_storage_space.init c contract total_size
Storage.Contract.Paid_storage_space.init c contract Z.zero | None -> begin
match Contract_repr.is_implicit contract with
| None -> | None ->
Storage.Contract.Used_storage_space.init c contract Z.zero
| Some _ ->
return c
end >>=? fun c ->
return c) >>=? fun c -> return c) >>=? fun c ->
return c return c