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

Dynamic discovery #26

Merged
merged 21 commits into from
Aug 12, 2024
Merged
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
37 changes: 28 additions & 9 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
venv/
env/

# Ignore Rust-related files
# Ignore Rust build output and related files
debug/
target/
Cargo.lock
*.rs.bk
*.pdb
/target
Scarb.lock
.snfoundry_cache/
stone-prover
bootloader*.json

# Ignore unnecessary Docker-related files
*.dockerfile
*docker-compose*.yaml

Expand All @@ -26,9 +26,28 @@ build/
# Ignore IPython/Jupyter Notebook checkpoints
.ipynb_checkpoints/

# Additional Docker-specific ignores
.dockerignore
.dockerignore.template
.dockerignore.generated
.dockerignore.custom
.dockerignore.local
# Miscellaneous
*.log
*.swp
*.swo
.env

# IDE-specific
.vscode/
.idea/

# System-specific
.DS_Store
Thumbs.db

# Directories not needed in Docker context
dashboard/
k8s/
docs/
registry/
utils/
.git/
.github/

# Secrets
*secret*
61 changes: 26 additions & 35 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,48 +1,39 @@
# python virtual environment
# Python
*.pyc
__pycache__/
venv/
env/
dist/
build/
*.egg-info/
.ipynb_checkpoints/

# Generated by Cargo
# will have compiled files and executables
# Rust
debug/
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.rs.bk
*.pdb


# Added by cargo

/target

Scarb.lock
.snfoundry_cache/

stone-prover

bootloader*.json

# Python
*.pyc
__pycache__/
venv/
env/
dist/
build/
*.egg-info/
# Docker
*.dockerfile

# PyInstaller
dist/
build/
# Miscellaneous
*.log
*.swp
*.swo
.env

# IPython Notebook
.ipynb_checkpoints
# IDE-specific
.vscode/
.idea/

# Jupyter Notebook
.ipynb_checkpoints/
# System-specific
.DS_Store
Thumbs.db

# Secrets
*secret*
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "stone-prover"]
path = stone-prover
url = https://github.com/iosis-tech/stone-prover.git
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ members = [
"crates/prover",
"crates/runner",
"crates/tests",

]
exclude = []

Expand Down Expand Up @@ -47,6 +46,7 @@ libp2p = { version = "0.53.2", features = [
"tcp",
"yamux",
"quic",
"serde",
] }
num-bigint = "0.4.4"
proptest = "1.4.0"
Expand Down
2 changes: 0 additions & 2 deletions cairo/bootloader/objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ def deserialize(self) -> bytes:

@dataclasses.dataclass(frozen=True)
class JobData(Task):
reward: int
num_of_steps: int
cairo_pie_compressed: FieldElementsData

def load_task(self) -> "CairoPieTask":
Expand Down
12 changes: 3 additions & 9 deletions cairo/bootloader/starknet/run_simple_bootloader.cairo
Original file line number Diff line number Diff line change
Expand Up @@ -147,25 +147,19 @@ func execute{builtin_ptrs: BuiltinData*, self_range_check_ptr}(
use_poseidon=use_poseidon,
);

local reward: felt;
local num_of_steps: felt;
local executor: felt;
local delegator: felt;

%{
ids.reward = simple_bootloader_input.job.job_data.reward
ids.num_of_steps = simple_bootloader_input.job.job_data.num_of_steps
ids.executor = simple_bootloader_input.public_key
ids.delegator = simple_bootloader_input.job.public_key
%}

assert [builtin_ptrs.output + 0] = reward;
assert [builtin_ptrs.output + 1] = num_of_steps;
assert [builtin_ptrs.output + 2] = executor;
assert [builtin_ptrs.output + 3] = delegator;
assert [builtin_ptrs.output + 0] = executor;
assert [builtin_ptrs.output + 1] = delegator;

local return_builtin_ptrs: BuiltinData = BuiltinData(
output=builtin_ptrs.output + 4,
output=builtin_ptrs.output + 2,
pedersen=builtin_ptrs.pedersen,
range_check=builtin_ptrs.range_check,
ecdsa=builtin_ptrs.ecdsa,
Expand Down
122 changes: 0 additions & 122 deletions crates/common/src/argvec.rs

This file was deleted.

48 changes: 0 additions & 48 deletions crates/common/src/fuzzing.rs

This file was deleted.

Loading
Loading