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

Snapp account prework #5645

Merged
merged 32 commits into from
Aug 18, 2020
Merged

Snapp account prework #5645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8db05b2
separate staged_ledger_hash into its own module
imeckler Jul 30, 2020
99d6f40
zexe backend updates
imeckler Jul 30, 2020
31572b0
pickles and pickles_types updates
imeckler Jul 30, 2020
7ee352a
random oracle updates
imeckler Jul 30, 2020
7181059
random oracle input opam
imeckler Jul 30, 2020
2a126bd
shuffle around ledger hash files
imeckler Jul 30, 2020
dc2fddf
snapp account type
imeckler Jul 30, 2020
902a4c1
separate out epoch_ledger type from consensus
imeckler Jul 30, 2020
6e4bd69
integrate snapp account, unused
imeckler Jul 30, 2020
9feee4d
refactor transaction logic
imeckler Jul 31, 2020
50074cc
add some type classes to pickles types
imeckler Aug 13, 2020
46b946c
add more type classes to pickles stuff
imeckler Aug 13, 2020
0e075f6
add typeclasses to zexe_backend proof
imeckler Aug 13, 2020
31e63ab
hash prefixes
imeckler Aug 13, 2020
025f3ed
yojson for epoch ledger
imeckler Aug 13, 2020
251cce1
type class for with hash
imeckler Aug 13, 2020
a1091ab
separate account_timing
imeckler Aug 13, 2020
b1a4f7e
snapp basic
imeckler Aug 13, 2020
c5e9872
snapp state
imeckler Aug 13, 2020
0508a26
snapp predicate
imeckler Aug 13, 2020
58695ac
snapp command
imeckler Aug 13, 2020
97f798b
revert transaction logic
imeckler Aug 13, 2020
37783d2
Merge remote-tracking branch 'origin/develop' into feature/snapp-acco…
imeckler Aug 13, 2020
bfe84fa
fix bad merge
imeckler Aug 13, 2020
819238c
fix compilation
imeckler Aug 13, 2020
ab9ebf9
Merge branch 'develop' into fix/snapp-account-prework
mrmr1993 Aug 17, 2020
135e76d
Remove snapp_account_opt_typ
mrmr1993 Aug 17, 2020
34a48a9
Fix nonconsensus compilation
mrmr1993 Aug 17, 2020
24f663e
Don't fail when reading accounts with None as the snapp hash
mrmr1993 Aug 17, 2020
73bdd59
Update expected versioning hash
mrmr1993 Aug 18, 2020
d26d1c1
Merge branch 'develop' into fix/snapp-account-prework
mrmr1993 Aug 18, 2020
b5f3a97
Merge branch 'develop' into fix/snapp-account-prework
mrmr1993 Aug 18, 2020
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
4 changes: 4 additions & 0 deletions src/lib/block_time/block_time.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ module Time = struct
end
end]

let max_value = UInt64.max_int

let zero = UInt64.zero

module Controller = struct
[%%if
time_offsets]
Expand Down
4 changes: 4 additions & 0 deletions src/lib/block_time/block_time.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ open Snark_bits
module Time : sig
type t [@@deriving sexp, compare, yojson]

val zero : t

val max_value : t

include Comparable.S with type t := t

include Hashable.S with type t := t
Expand Down
Loading