Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/app/zeko/circuits/dune
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
(:standard -w @a-42-40-44-70-45-41))))

(library
(public_name zeko_circuits)
(name zeko_circuits)
(libraries
;; opam libraries
Expand Down Expand Up @@ -64,4 +65,4 @@
zeko_util
zeko_as_prover)
(virtual_modules zeko_as_prover)
(default_implementation zeko_circuits_as_prover))
(default_implementation zeko_circuits.as_prover))
13 changes: 7 additions & 6 deletions src/app/zeko/circuits_as_prover/dune
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
(env (_ (flags (:standard -w @a-42-40-44-70-45-41))))
(env
(_
(flags
(:standard -w @a-42-40-44-70-45-41))))

(library
(public_name zeko_circuits.as_prover)
(name zeko_circuits_as_prover)
(implements zeko_circuits)
(libraries
zeko_circuits
)
)
(implements zeko_circuits)
(libraries zeko_circuits))
4 changes: 3 additions & 1 deletion src/app/zeko/compile_simple/dune
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
(:standard -w @a-42-40-44-70-45-41))))

(library
(public_name zeko_compile_simple)
(name compile_simple)
(libraries
;; opam libraries
Expand All @@ -14,4 +15,5 @@
(preprocess
(pps ppx_mina))
(modules compile_simple compile_simple_intf)
(virtual_modules compile_simple))
(virtual_modules compile_simple)
(default_implementation zeko_compile_simple.real))
8 changes: 4 additions & 4 deletions src/app/zeko/compile_simple/real/dune
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
(env
(_
(flags (:standard -w @a-42-40-44-70-45-41))))
(flags
(:standard -w @a-42-40-44-70-45-41))))

(library
(public_name zeko_compile_simple.real)
(name compile_simple_real_impl)
(implements compile_simple)
(libraries
Expand All @@ -27,9 +29,7 @@

(library
(name compile_simple_real)
(libraries
core_kernel
compile_simple_real_impl)
(libraries core_kernel compile_simple_real_impl)
(instrumentation
(backend bisect_ppx))
(preprocess
Expand Down
1 change: 1 addition & 0 deletions src/app/zeko/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(library
(public_name zeko_constants)
(name zeko_constants)
(libraries mina_base signature_lib snark_params genesis_constants currency)
(inline_tests)
Expand Down
4 changes: 2 additions & 2 deletions src/app/zeko/indexed_merkle_tree/indexed_merkle_tree.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core
open Core_kernel
open Signature_lib
open Merkle_ledger
open Mina_base
Expand Down Expand Up @@ -27,7 +27,7 @@ module Location_binable = struct
end

module Kvdb : Intf.Key_value_database with type config := string =
Rocksdb.Database
Mina_ledger_kvdb.Database

module Storage_locations : Intf.Storage_locations = struct
let key_value_db_dir = "mina_key_value_db"
Expand Down
4 changes: 3 additions & 1 deletion src/app/zeko/v/dune
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
(env
(_
(flags (:standard -w @a-42-40-44-70-45-41))))
(flags
(:standard -w @a-42-40-44-70-45-41))))

(library
(public_name zeko_v)
(name v)
(libraries
;; opam libraries
Expand Down
6 changes: 6 additions & 0 deletions src/dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@
(package (name with_hash))
(package (name work_partitioner))
(package (name work_selector))
(package (name zeko_circuits))
(package (name zeko_circuits_as_prover))
(package (name zeko_compile_simple))
(package (name zeko_compile_simple.real))
(package (name zeko_constants))
(package (name zeko_v))
(package (name zkapp_command_builder))
(package (name zkapps_examples))
(package (name zkapp_limits))
Expand Down
3 changes: 1 addition & 2 deletions src/lib/concurrency/pipe_lib/dune
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
sexplib
core_kernel
async_kernel
core
ppx_inline_test.config
;; local libraries
run_in_thread
logger
o1trace)
)
(instrumentation
(backend bisect_ppx))
(preprocess
Expand Down
4 changes: 2 additions & 2 deletions src/lib/concurrency/pipe_lib/swappable_strict_pipe.ml
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ let step (type data_in_pipe write_return)
short_lived_write state short_lived_sink data

let background_thread ~name (t : _ state_t) =
O1trace.background_thread (name ^ "-swappable") (fun () ->
Deferred.repeat_until_finished t step )
let (_ : string) = name in
don't_wait_for (Deferred.repeat_until_finished t step)

let create (type data_in_pipe pipe_kind write_return) ?warn_on_drop ~name
(type_ : (data_in_pipe, pipe_kind, write_return) Strict_pipe.type_) :
Expand Down
4 changes: 2 additions & 2 deletions src/lib/consensus/constants.ml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ let create ~(constraint_constants : Genesis_constants.Constraint_constants.t)
let checkpoint_window_slots_per_year, checkpoint_window_size_in_slots =
let per_year = 12 in
let slots_per_year =
let one_year_ms = Core.Time.Span.(to_ms (of_day 365.)) |> Float.to_int in
let one_year_ms = Time.Span.(to_ms (of_day 365.)) |> Float.to_int in
one_year_ms
/ (Block_time.Span.to_ms constants.slot_duration_ms |> Int64.to_int_exn)
in
Expand Down Expand Up @@ -434,7 +434,7 @@ module Checked = struct
in
let%bind slots_per_year, _ =
let one_year_ms =
constant (Core.Time.Span.(to_ms (of_day 365.)) |> Float.to_int)
constant (Time.Span.(to_ms (of_day 365.)) |> Float.to_int)
in
N.div_mod one_year_ms slot_duration_ms
in
Expand Down
11 changes: 2 additions & 9 deletions src/lib/consensus/dune
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@
(libraries
;; opam libraries
ppx_inline_test.config
async_unix
core.uuid
async_kernel
sexplib0
base.caml
integers
async
core
yojson
core_kernel
bin_prot.shape
Expand Down Expand Up @@ -54,7 +50,6 @@
mina_transaction_logic
key_gen
block_time
perf_histograms
test_util
non_zero_curve_point
mina_metrics
Expand All @@ -66,7 +61,6 @@
crypto_params
data_hash_lib
currency
file_system
coda_genesis_ledger
interruptible
network_peer
Expand All @@ -75,10 +69,9 @@
sparse_ledger_lib
syncable_ledger
trust_system
run_in_thread
mina_base.import
ppx_version.runtime
internal_tracing
o1trace)
ppx_version.runtime)
(preprocess
(pps
h_list.ppx
Expand Down
2 changes: 1 addition & 1 deletion src/lib/consensus/epoch.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core
open Core_kernel
open Signed
open Unsigned
open Num_util
Expand Down
2 changes: 1 addition & 1 deletion src/lib/consensus/global_slot.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
open Unsigned
open Core
open Core_kernel
open Snark_params.Tick
module Wire_types = Mina_wire_types.Consensus_global_slot

Expand Down
2 changes: 1 addition & 1 deletion src/lib/consensus/intf.ml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
open Core_kernel
open Mina_numbers
open Async
open Async_kernel
open Currency
open Signature_lib
open Mina_base
Expand Down
Loading
Loading