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.

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

V4.0.0 rc.2 #1838

Open
wants to merge 50 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
2b6bd90
Merge pull request #8 from succinctlabs/tamir/merge-upstream
tamirhemo Sep 5, 2024
f17c080
Merge remote-tracking branch 'upstream/dev' into dev
tamirhemo Sep 10, 2024
4b7b72e
Merge remote-tracking branch 'upstream/dev' into tqn/merge-upstream
tqn Sep 13, 2024
7ec9cd6
Merge pull request #15 from succinctlabs/tqn/merge-upstream
tqn Sep 13, 2024
35c1ee4
Merge remote-tracking branch 'origin/dev' into kevjue/merge_upstream
kevjue Sep 20, 2024
1728714
Merge pull request #18 from succinctlabs/kevjue/merge_upstream
kevjue Sep 20, 2024
35b8d99
Merge remote-tracking branch 'upstream/dev' into tqn/merge-upstream
tqn Oct 17, 2024
544d59b
Merge pull request #30 from succinctlabs/tqn/merge-upstream
tqn Oct 17, 2024
369e1c0
Merge remote-tracking branch 'upstream/dev' into tamir/dev-10-18
tamirhemo Oct 18, 2024
e0a7dec
Merge pull request #34 from succinctlabs/tamir/dev-10-18
tamirhemo Oct 18, 2024
05fc72f
Merge remote-tracking branch 'upstream/dev' into tamir/update-10-22
tamirhemo Oct 22, 2024
a8af928
Merge pull request #36 from succinctlabs/tamir/update-10-22
tamirhemo Oct 22, 2024
f41d750
Merge remote-tracking branch 'upstream/dev' into dev
jtguibas Oct 28, 2024
4870b74
Merge remote-tracking branch 'upstream/dev' into dev
jtguibas Oct 29, 2024
e6e8bce
Merge remote-tracking branch 'upstream/dev' into erabinov/merge-upstream
erabinov Nov 3, 2024
474bbe2
Merge pull request #54 from succinctlabs/erabinov/merge-upstream
erabinov Nov 4, 2024
41f7fe1
Merge remote-tracking branch 'upstream/dev' into tamir/update-nov-5
tamirhemo Nov 5, 2024
5253c03
Merge pull request #58 from succinctlabs/tamir/update-nov-5
tamirhemo Nov 5, 2024
8a696d2
Merge remote-tracking branch 'upstream/dev' into dev
tamirhemo Nov 5, 2024
6af5b1d
Merge remote-tracking branch 'upstream/dev' into dev
tamirhemo Nov 5, 2024
31147b4
perf: remove proving single proofs (#60)
erabinov Nov 7, 2024
fbceea5
Merge remote-tracking branch 'upstream/dev' into tamir/update
tamirhemo Nov 7, 2024
d8ca89c
Merge remote-tracking branch 'upstream/dev' into dev
tamirhemo Nov 8, 2024
c9662c4
perf: drop record in different task (#65)
tamirhemo Nov 8, 2024
2614e21
feat: execute mode on `perf` (#62)
tamirhemo Nov 8, 2024
adcda87
perf: two shapes + shape script (#63)
erabinov Nov 11, 2024
61a2c7b
feat: v4.0.0-rc.1
jtguibas Nov 27, 2024
a07d564
run fmt + cleanup
jtguibas Nov 27, 2024
c7a903d
change lib version to rc.1
jtguibas Nov 27, 2024
62f5701
update circuits
jtguibas Nov 27, 2024
3aadc5b
update versions
jtguibas Nov 27, 2024
8e5489a
add force
jtguibas Nov 27, 2024
6ca89e3
update docs
jtguibas Nov 27, 2024
c343dc7
update cuda image
jtguibas Nov 27, 2024
107f338
fix divrem on avx256
jtguibas Nov 27, 2024
4c3326c
update suite
jtguibas Nov 27, 2024
9e13d02
update vkeys and workflow dispatch
jtguibas Nov 27, 2024
8602333
merge main
nhtyy Dec 4, 2024
012efa5
merge dev
nhtyy Dec 4, 2024
75b90be
merge fixes
nhtyy Dec 4, 2024
8b3be09
hook r1 ecrecover
umadayal Dec 4, 2024
03ec601
fix: test proofs
nhtyy Dec 4, 2024
c8cc8a6
add r1 patch
nhtyy Dec 4, 2024
dcd1b87
small adjustmenets
jtguibas Dec 5, 2024
74dad2f
add missing file
jtguibas Dec 5, 2024
43792f1
fix: cuda link
nhtyy Dec 5, 2024
e1c2fb3
fixes
umadayal Dec 5, 2024
1eb5c7b
fix: remove nomralization in ecsda hooks
nhtyy Dec 5, 2024
6dc55e6
fix: cuda pass vars
nhtyy Dec 5, 2024
a91f59c
bump version
nhtyy Dec 5, 2024
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
83 changes: 83 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Google C/C++ Code Style settings
# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
# Author: Kehan Xue, kehan.xue (at) gmail.com

Language: Cpp
BasedOnStyle: Google
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: None
AlignOperands: Align
AllowAllArgumentsOnNextLine: true
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Empty
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: Never # To avoid conflict, set this "Never" and each "if statement" should include brace when coding
AllowShortLambdasOnASingleLine: Inline
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterStruct: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakBeforeBinaryOperators: None
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
BreakInheritanceList: BeforeColon
ColumnLimit: 80
CompactNamespaces: false
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false # Make sure the * or & align on the left
EmptyLineBeforeAccessModifier: LogicalBlock
FixNamespaceComments: true
IncludeBlocks: Preserve
IndentCaseLabels: true
IndentPPDirectives: None
IndentWidth: 2
KeepEmptyLinesAtTheStartOfBlocks: true
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PointerAlignment: Left
ReflowComments: false
# SeparateDefinitionBlocks: Always # Only support since clang-format 14
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++11
TabWidth: 4
UseTab: Never
12 changes: 11 additions & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ runs:
else
echo "pkg-config and libssl-dev are already installed."
fi


- name: Echo docker buildx version
shell: bash
run: docker buildx version

- name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=public.ecr.aws/vend/moby/buildkit:buildx-stable-1
18 changes: 9 additions & 9 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run cargo check
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run cargo check
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run cargo fmt
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Check workspace no features
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run cargo fmt
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run cargo prove new
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run Evaluation
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --force --locked --path .
cargo install --locked --force --path .
cargo clean

- name: Run tendermint script
Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:

# - name: "Install cargo-prove"
# run: |
# cargo install --force --locked --path ./crates/cli
# cargo install --locked --force --path ./crates/cli

# - name: "Install SP1 toolchain"
# run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-plz.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
push:
branches:
- main
workflow_dispatch:

jobs:
release-plz:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ jobs:
command: clean
toolchain: 1.81.0

- name: Install SP1 toolchain from repo
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --locked --force --path .
cargo clean

- name: Run sp1-perf
uses: actions-rs/cargo@v1
with:
Expand All @@ -67,6 +74,7 @@ jobs:
args: --release -p sp1-perf -- --program workdir/program.bin --stdin workdir/stdin.bin --mode cpu
env:
RUST_LOG: info
VERIFY_VK: false
RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
RUST_BACKTRACE: 1

Expand Down Expand Up @@ -112,6 +120,13 @@ jobs:
command: clean
toolchain: 1.81.0

- name: Install SP1 toolchain from repo
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --locked --force --path .
cargo clean

- name: Run sp1-perf
uses: actions-rs/cargo@v1
with:
Expand All @@ -120,6 +135,7 @@ jobs:
args: --release -p sp1-perf -- --program workdir/program.bin --stdin workdir/stdin.bin --mode cuda
env:
RUST_LOG: debug
VERIFY_VK: false
RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
RUST_BACKTRACE: 1
SP1_PROVER: cuda
Expand Down Expand Up @@ -164,6 +180,13 @@ jobs:
command: clean
toolchain: 1.81.0

- name: Install SP1 toolchain from repo
run: |
cargo run -p sp1-cli -- prove install-toolchain
cd crates/cli
cargo install --locked --force --path .
cargo clean

- name: Run sp1-perf
uses: actions-rs/cargo@v1
with:
Expand All @@ -172,6 +195,7 @@ jobs:
args: --release -p sp1-perf --features "native-gnark,network-v2" -- --program workdir/program.bin --stdin workdir/stdin.bin --mode network
env:
RUST_LOG: info
VERIFY_VK: false
RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
RUST_BACKTRACE: 1
SP1_PROVER: network
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ crates/prover/trusted-setup
crates/prover/vk

# Example legacy elf
examples/elf
examples/elf
# Example fibonacci groth16 / plonk proofs
examples/fibonacci/fibonacci-groth16.bin
examples/fibonacci/fibonacci-plonk.bin
18 changes: 18 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,22 @@
// "rust-analyzer.check.workspace": false,
// "rust-analyzer.check.invocationStrategy": "once",
// "rust-analyzer.cargo.buildScripts.invocationStrategy": "once",
"C_Cpp.default.includePath": [
"${workspaceFolder}/crates/**/include",
"${workspaceFolder}/target/include",
],
"C_Cpp.intelliSenseEngine": "Tag Parser",
"files.associations": {
"random": "cpp",
"chrono": "cpp",
"cstdint": "cpp",
"ratio": "cpp",
"system_error": "cpp",
"array": "cpp",
"functional": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"cmath": "cpp"
},
}
Loading
Loading