Dlog only SNARK

.circleci/config.yml

@@ -186,6 +186,8 @@ jobs:
                   command:  bash -c 'eval `opam config env` && LIBP2P_NIXLESS=1 make build_archive'
                   environment:
                     DUNE_PROFILE: testnet_postake_medium_curves
+                  paths:
+                    - "/home/opam/.cargo/bin"
             # NOTE: If we were using a machine executor we would be able to mount the sql file in
             # as a volume for the container to seed itself, this is the workaround.
             # Ideally this DB setup step would be handled by the archive process itself.
@@ -327,7 +329,9 @@ jobs:
 
             - run:
                   name: Compare test signatures for consensus, nonconsensus code
-                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && ./scripts/compare_test_signatures.sh'
+                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/compare_test_signatures.sh'
+                  paths:
+                    - "/home/opam/.cargo/bin"
     update-branch-protection:
         docker:
             - image: python:3
@@ -610,19 +614,21 @@ jobs:
             # See https://bkase.dev/posts/ocaml-writer#fn-3 for rationale
             - run:
                   name: Generate PV keys
-                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && LIBP2P_NIXLESS=1 make build_pv_keys 2>&1 | tee /tmp/artifacts/buildocaml.log'
+                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && PATH="$HOME/.cargo/bin:$PATH" LIBP2P_NIXLESS=1 make build_pv_keys 2>&1 | tee /tmp/artifacts/buildocaml.log'
                   environment:
                     DUNE_PROFILE: testnet_postake_medium_curves
                     EXTRA_NIX_ARGS: --option sandbox false
+                  paths:
+                    - "/home/opam/.cargo/bin"
                   no_output_timeout: 20m
             - run:
                   name: Upload generated PV keys
                   command: ./scripts/skip_if_only_frontend_or_rfcs.sh scripts/publish-pvkeys.sh
             - run:
                   name: Rebuild for pvkey changes
                   command: |
-                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && make build 2>&1 | tee /tmp/artifacts/buildocaml2.log'
-                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune build src/app/generate_keypair/generate_keypair.exe'
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && make build 2>&1 | tee /tmp/artifacts/buildocaml2.log'
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune build src/app/generate_keypair/generate_keypair.exe'
                   environment:
                     DUNE_PROFILE: testnet_postake_medium_curves
                     EXTRA_NIX_ARGS: --option sandbox false
@@ -633,11 +639,11 @@ jobs:
             - run:
                 name: Output compiled ledger and genesis proof
                 command: |
-                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune exec --profile=testnet_postake_medium_curves src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe'
+                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune exec --profile=testnet_postake_medium_curves src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe'
             - run:
                 name: Generate runtime ledger with 10k accounts
                 command: |
-                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune exec --profile=testnet_postake_medium_curves src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe -- --config-file genesis_ledgers/phase_three/config.json'
+                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune exec --profile=testnet_postake_medium_curves src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe -- --config-file genesis_ledgers/phase_three/config.json'
                 no_output_timeout: 20m
             - run:
                 name: Upload genesis data

.circleci/config.yml.jinja

@@ -155,6 +155,8 @@ jobs:
                   command:  bash -c 'eval `opam config env` && LIBP2P_NIXLESS=1 make build_archive'
                   environment:
                     DUNE_PROFILE: testnet_postake_medium_curves
+                  paths:
+                    - "/home/opam/.cargo/bin"
             # NOTE: If we were using a machine executor we would be able to mount the sql file in
             # as a volume for the container to seed itself, this is the workaround.
             # Ideally this DB setup step would be handled by the archive process itself.
@@ -224,7 +226,9 @@ jobs:
             {{ opam_init_linux }}
             - run:
                   name: Compare test signatures for consensus, nonconsensus code
-                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && ./scripts/compare_test_signatures.sh'
+                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/compare_test_signatures.sh'
+                  paths:
+                    - "/home/opam/.cargo/bin"
     update-branch-protection:
         docker:
             - image: python:3
@@ -440,19 +444,21 @@ jobs:
             # See https://bkase.dev/posts/ocaml-writer#fn-3 for rationale
             - run:
                   name: Generate PV keys
-                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && LIBP2P_NIXLESS=1 make build_pv_keys 2>&1 | tee /tmp/artifacts/buildocaml.log'
+                  command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && PATH="$HOME/.cargo/bin:$PATH" LIBP2P_NIXLESS=1 make build_pv_keys 2>&1 | tee /tmp/artifacts/buildocaml.log'
                   environment:
                     DUNE_PROFILE: {{profile}}
                     EXTRA_NIX_ARGS: --option sandbox false
+                  paths:
+                    - "/home/opam/.cargo/bin"
                   no_output_timeout: 20m
             - run:
                   name: Upload generated PV keys
                   command: ./scripts/skip_if_only_frontend_or_rfcs.sh scripts/publish-pvkeys.sh
             - run:
                   name: Rebuild for pvkey changes
                   command: |
-                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && make build 2>&1 | tee /tmp/artifacts/buildocaml2.log'
-                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune build src/app/generate_keypair/generate_keypair.exe'
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && make build 2>&1 | tee /tmp/artifacts/buildocaml2.log'
+                    ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune build src/app/generate_keypair/generate_keypair.exe'
                   environment:
                     DUNE_PROFILE: {{profile}}
                     EXTRA_NIX_ARGS: --option sandbox false
@@ -463,11 +469,11 @@ jobs:
             - run:
                 name: Output compiled ledger and genesis proof
                 command: |
-                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune exec --profile={{profile}} src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe'
+                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune exec --profile={{profile}} src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe'
             - run:
                 name: Generate runtime ledger with 10k accounts
                 command: |
-                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && dune exec --profile={{profile}} src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe -- --config-file genesis_ledgers/phase_three/config.json'
+                  ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && dune exec --profile={{profile}} src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe -- --config-file genesis_ledgers/phase_three/config.json'
                 no_output_timeout: 20m
             - run:
                 name: Upload genesis data

src/app/cli/src/coda.ml

@@ -33,7 +33,7 @@ let maybe_sleep _ = Deferred.unit
 let chain_id ~genesis_state_hash ~genesis_constants =
   let genesis_state_hash = State_hash.to_base58_check genesis_state_hash in
   let genesis_constants_hash = Genesis_constants.hash genesis_constants in
-  let all_snark_keys = String.concat ~sep:"" Snark_keys.key_hashes in
+  let all_snark_keys = String.concat ~sep:"" Precomputed_values.key_hashes in
   let b2 =
     Blake2.digest_string
       (genesis_state_hash ^ all_snark_keys ^ genesis_constants_hash)
@@ -440,6 +440,7 @@ let daemon logger =
                    "Could not parse configuration from $config_file: $error"
                    ~metadata:
                      [ ("config_file", `String config_file)
+                     ; ("config_json", config_json)
                      ; ("error", `String err) ] ;
                  failwithf "Could not parse configuration: %s" err () )
            | _ ->
@@ -976,6 +977,9 @@ let ensure_testnet_id_still_good _ = Deferred.unit
 [%%endif]
 
 let snark_hashes =
+  let module Hashes = struct
+    type t = string list [@@deriving to_yojson]
+  end in
   let open Command.Let_syntax in
   Command.basic ~summary:"List hashes of proving and verification keys"
     [%map_open
@@ -985,8 +989,8 @@ let snark_hashes =
         if json then
           print
             (Yojson.Safe.to_string
-               (Snark_keys.key_hashes_to_yojson Snark_keys.key_hashes))
-        else List.iter Snark_keys.key_hashes ~f:print]
+               (Hashes.to_yojson Precomputed_values.key_hashes))
+        else List.iter Precomputed_values.key_hashes ~f:print]
 
 let internal_commands =
   [ (Snark_worker.Intf.command_name, Snark_worker.command)
@@ -1053,7 +1057,6 @@ let coda_commands logger =
   ; ("advanced", Client.advanced)
   ; ("internal", Command.group ~summary:"Internal commands" internal_commands)
   ; (Parallel.worker_command_name, Parallel.worker_command)
-  ; (Snark_flame_graphs.name, Snark_flame_graphs.command)
   ; ("transaction-snark-profiler", Transaction_snark_profiler.command) ]
 
 [%%if
@@ -1088,7 +1091,6 @@ let coda_commands logger =
         ; (module Coda_change_snark_worker_test)
         ; (module Full_test)
         ; (module Transaction_snark_profiler)
-        ; (module Snark_flame_graphs)
         ; (module Coda_archive_node_test)
         ; (module Coda_archive_processor_test) ]
         : (module Integration_test) list )

src/app/cli/src/init/client.ml

@@ -686,7 +686,7 @@ let constraint_system_digests =
     (Command.Param.return (fun () ->
          let all =
            Transaction_snark.constraint_system_digests ()
-           @ Blockchain_snark.Blockchain_transition.constraint_system_digests
+           @ Blockchain_snark.Blockchain_snark_state.constraint_system_digests
                ()
          in
          let all =

src/app/cli/src/init/transaction_snark_profiler.ml

@@ -145,7 +145,7 @@ let pending_coinbase_stack_target (t : Transaction.t) stack =
 (* This gives the "wall-clock time" to snarkify the given list of transactions, assuming
    unbounded parallelism. *)
 let profile (module T : Transaction_snark.S) sparse_ledger0
-    (transitions : Transaction.t list) preeval =
+    (transitions : Transaction.t list) _ =
   let constraint_constants = Genesis_constants.Constraint_constants.compiled in
   let txn_global_slot = Lazy.force curr_global_slot in
   let (base_proof_time, _, _), base_proofs =
@@ -167,8 +167,7 @@ let profile (module T : Transaction_snark.S) sparse_ledger0
         in
         let span, proof =
           time (fun () ->
-              T.of_transaction ?preeval ~constraint_constants
-                ~sok_digest:Sok_message.Digest.default
+              T.of_transaction ~sok_digest:Sok_message.Digest.default
                 ~source:(Sparse_ledger.merkle_root sparse_ledger)
                 ~target:(Sparse_ledger.merkle_root sparse_ledger')
                 ~init_stack:coinbase_stack_source ~next_available_token_before
@@ -311,10 +310,7 @@ let main num_transactions repeats preeval () =
   Snarky.Libsnark.set_no_profiling false ;
   Snarky.Libsnark.set_printing_off () ;
   Test_util.with_randomness 123456789 (fun () ->
-      let keys = Transaction_snark.Keys.create () in
-      let module T = Transaction_snark.Make (struct
-        let keys = keys
-      end) in
+      let module T = Transaction_snark.Make () in
       run (profile (module T)) num_transactions repeats preeval )
 
 let dry num_transactions repeats preeval () =

src/app/cli/src/tests/full_test.ml

@@ -38,7 +38,7 @@ let with_check = false
 [%%endif]
 
 [%%if
-curve_size = 753]
+curve_size = 255]
 
 let medium_curves = true
 

src/app/client_sdk/tests/test_signatures.js

@@ -2,16 +2,16 @@ var coda = require("../../../../_build/default/src/app/client_sdk/client_sdk.bc.
 
 var keypair = {
   privateKey:
-    "6BnSDyt3FKhJSt5oDk1HHeM5J8uKSnp7eaSYndj53y7g7oYzUEhHFrkpk6po4XfNFyjtoJK4ovVHvmCgdUqXVEfTXoAC1CNpaGLAKtu7ah9i4dTi3FtcoKpZhtiTGrRQkEN6Q95cb39Kp",
+    "EKFdTXQKPsEi2JUSE3JkmKtKFu8uDcgc5MmR5zj6nz5FUWPVuK6c",
   publicKey:
-    "4vsRCVnc5xmYJhaVbUgkg6po6nR3Mu7KEFunP3uQL67qZmPNnJKev57TRvMfuJ15XDP8MjaLSh7THG7CpTiTkfgRcQAKGmFo1XGMStCucmWAxBUiXjycDbx7hbVCqkDYiezM8Lvr1NMdTEGU",
+    "B62qkef7po74VEvJYcLYsdZ83FuKidgNZ8Xiaitzo8gKJXaxLwxgG7T",
 };
 
 var receiver =
-  "4vsRCVHzeYYbneMkHR3u445f8zYwo6nhx3UHKZQH7B2txTV5Shz66Ds9PdxoRKCiALWtuwPQDwpm2Kj22QPcZpKCLr6rnHmUMztKpWxL9meCPQcTkKhmK5HyM4Y9dMnTKrEjD1MX71kLTUaP";
+  "B62qnekV6LVbEttV7j3cxJmjSbxDWuXa5h3KeVEXHPGKTzthQaBufrY";
 
 var newDelegate =
-  "4vsRCVQNkGihARy4Jg9FsJ6NFtnwDsRnTqi2gQnPAoCNUoyLveY6FEnicGMmwEumPx3GjLxAb5fAivVSLnYRPPMfb5HdkhLdjHunjgqp6g7gYi8cWy4avdmHMRomaKkWyWeWn91w7baaFnUk";
+  "B62qoW9n8n54FqHV8dPp7eCtpAZS1Jw9zsK7AHHiYmUzi6Wvms8reqt";
 
 var payments = [
     {

src/app/client_sdk/tests/test_signatures.ml

@@ -27,26 +27,26 @@ open Signature_lib
 
 let signer_pk =
   Public_key.Compressed.of_base58_check_exn
-    "4vsRCVnc5xmYJhaVbUgkg6po6nR3Mu7KEFunP3uQL67qZmPNnJKev57TRvMfuJ15XDP8MjaLSh7THG7CpTiTkfgRcQAKGmFo1XGMStCucmWAxBUiXjycDbx7hbVCqkDYiezM8Lvr1NMdTEGU"
+    "B62qkef7po74VEvJYcLYsdZ83FuKidgNZ8Xiaitzo8gKJXaxLwxgG7T"
 
 (* signer *)
 let keypair =
   let private_key =
     Private_key.of_base58_check_exn
-      "6BnSDyt3FKhJSt5oDk1HHeM5J8uKSnp7eaSYndj53y7g7oYzUEhHFrkpk6po4XfNFyjtoJK4ovVHvmCgdUqXVEfTXoAC1CNpaGLAKtu7ah9i4dTi3FtcoKpZhtiTGrRQkEN6Q95cb39Kp"
+      "EKFdTXQKPsEi2JUSE3JkmKtKFu8uDcgc5MmR5zj6nz5FUWPVuK6c"
   in
   let public_key = Public_key.decompress_exn signer_pk in
   Keypair.{public_key; private_key}
 
 (* payment receiver *)
 let receiver =
   Public_key.Compressed.of_base58_check_exn
-    "4vsRCVHzeYYbneMkHR3u445f8zYwo6nhx3UHKZQH7B2txTV5Shz66Ds9PdxoRKCiALWtuwPQDwpm2Kj22QPcZpKCLr6rnHmUMztKpWxL9meCPQcTkKhmK5HyM4Y9dMnTKrEjD1MX71kLTUaP"
+    "B62qnekV6LVbEttV7j3cxJmjSbxDWuXa5h3KeVEXHPGKTzthQaBufrY"
 
 (* delegatee *)
 let new_delegate =
   Public_key.Compressed.of_base58_check_exn
-    "4vsRCVQNkGihARy4Jg9FsJ6NFtnwDsRnTqi2gQnPAoCNUoyLveY6FEnicGMmwEumPx3GjLxAb5fAivVSLnYRPPMfb5HdkhLdjHunjgqp6g7gYi8cWy4avdmHMRomaKkWyWeWn91w7baaFnUk"
+    "B62qoW9n8n54FqHV8dPp7eCtpAZS1Jw9zsK7AHHiYmUzi6Wvms8reqt"
 
 let make_common ~fee ~fee_payer_pk ~nonce ~valid_until memo =
   let fee = Currency.Fee.of_int fee in

src/app/runtime_genesis_ledger/dune

@@ -11,7 +11,6 @@
     coda_genesis_proof
     coda_state
     genesis_ledger_helper
-    keys_lib
     coda_runtime_config
     snark_keys
     snark_params

src/config/curve/medium.mlh

@@ -1 +1 @@
-[%%define curve_size 753]
+[%%define curve_size 255]

src/config/debug.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/full.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/standard.mlh"]

src/config/dev.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/small.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/medium.mlh"]

src/config/dev_frontend.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/full.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/standard.mlh"]

src/config/dev_snark.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/full.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/standard.mlh"]

src/config/fake_hash.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/tiny.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_tiny.mlh"]
 [%%import "/src/config/scan_state/medium.mlh"]

src/config/fuzz_small.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/tiny.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/medium.mlh"]

src/config/print_versioned_types.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/small.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_short.mlh"]
 [%%import "/src/config/scan_state/medium.mlh"]

src/config/test_archive_processor.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/tiny.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_tiny.mlh"]
 [%%import "/src/config/scan_state/medium.mlh"]

src/config/test_postake.mlh

@@ -1,5 +1,5 @@
 [%%import "/src/config/ledger_depth/full.mlh"]
-[%%import "/src/config/curve/small.mlh"]
+[%%import "/src/config/curve/medium.mlh"]
 [%%import "/src/config/coinbase/standard.mlh"]
 [%%import "/src/config/consensus/postake_tiny.mlh"]
 [%%import "/src/config/scan_state/tiny.mlh"]