Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix transfer claim #214

Draft
wants to merge 1 commit into
base: compatible
Choose a base branch
from
Draft

Fix transfer claim #214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/app/zeko/zkapps_rollup.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ module Process_transfer = struct
(* We give it permission *)
; implicit_account_creation_fee =
Boolean.false_ (* Custom token account, can't be true *)
; events =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have actions already?

(* Need to expose transfer for data availability *)
(let empty_events = Zkapp_account.Events.(constant typ []) in
Events.push_to_data_as_hash empty_events
(var_to_fields TR.typ transfer) )
}
in
let child_helper : Zkapp_call_forest.Checked.account_update =
Expand Down Expand Up @@ -750,18 +755,15 @@ module Make (T' : Transaction_snark.S) = struct
Deferred.t )
Pickles.Prover.t

let process_transfer ~is_new ~pointer ~before ~after ~transfer ~vk_hash
~public_key (prover : transfer_prover) =
let process_transfer ~is_new ~pointer ~before ~after ~(transfer : TR.t)
~vk_hash ~public_key (prover : transfer_prover) =
let before = List.map ~f:(value_to_actions TR.typ) before in
let after = List.map ~f:(value_to_actions TR.typ) after in
let%bind trans1 =
Action_state_extension.prove ~dummy:is_new ~source:pointer before
Action_state_extension.prove ~dummy:is_new
~source:Zkapp_account.Actions.empty_state_element before
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty sure this is somewhat wrong, somewhat right, but it isn't worth it I think

in
let pointer' =
Actions.push_events (Action_state_extension.statement trans1).target
(value_to_actions TR.typ transfer)
in
let%bind trans2 = Action_state_extension.prove ~source:pointer' after in
let%bind trans2 = Action_state_extension.prove ~source:pointer after in
let child =
{ Body.dummy with
public_key = transfer.recipient
Expand Down Expand Up @@ -795,7 +797,7 @@ module Make (T' : Transaction_snark.S) = struct
; authorization = None_given
}
in
( `Pointer pointer'
( `Pointer pointer
, Zkapp_command.Call_forest.(
cons_tree (mktree tree proof)
( if is_new then
Expand Down