Skip to content

Commit

Permalink
Merge branch 'mainnet' of https://github.com/aleonet/snarkvm into mai…
Browse files Browse the repository at this point in the history
…nnet
  • Loading branch information
lukenewman committed Aug 6, 2024
2 parents fddd8b9 + be171ce commit 3a7da0b
Show file tree
Hide file tree
Showing 214 changed files with 13,376 additions and 1,663 deletions.
197 changes: 123 additions & 74 deletions .circleci/config.yml

Large diffs are not rendered by default.

85 changes: 59 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ cli = [
aleo-cli = [ "snarkvm-synthesizer/aleo-cli" ]
async = [ "snarkvm-ledger/async", "snarkvm-synthesizer/async" ]
cuda = [ "snarkvm-algorithms/cuda" ]
history = [ "snarkvm-synthesizer/history" ]
parameters_no_std_out = [ "snarkvm-parameters/no_std_out" ]
noconfig = [ ]
rocks = [ "snarkvm-ledger/rocks", "snarkvm-synthesizer/rocks" ]
Expand Down
Loading

0 comments on commit 3a7da0b

Please sign in to comment.