Commit 9039a18

committed

Merge branch 'refs/heads/testnet' into merge_testnet_v_0_10_3

# Conflicts: # batcher/Cargo.lock

2 parents d589ea5 + b6834ea commit 9039a18Copy full SHA for 9039a18

41 files changed

+2419

-2533

lines changed

Makefile
batcher
- Cargo.lock
- aligned-batcher
  - Cargo.toml
- aligned
  - Cargo.toml
docs
- 2_architecture
  - 0_supported_verifiers.md
- 3_guides
- operator_guides
  - 0_running_an_operator.md
examples
- validating-public-input/risc_zero/fibonacci_proof_generator
  - Cargo.lock
  - host
    - Cargo.toml
  - methods
    - Cargo.toml
    - guest
      - Cargo.lock
      - Cargo.toml
- zkquiz/quiz
  - program
  - script
    - Cargo.lock
    - Cargo.toml
operator
- risc_zero_old
  - lib/src
    - lib.rs
  - risc_zero_old_test.go
- risc_zero
  - lib/src
    - lib.rs
  - risc_zero_test.go
- sp1_old
  - lib/src
    - lib.rs
  - sp1_old_test.go
- sp1
  - lib/src
    - lib.rs
  - sp1_test.go
scripts/test_files
- risc_zero/fibonacci_proof_generator
- sp1

41 files changed

+2419

-2533

lines changed

`‎Makefile‎`

-Original file line number
+Diff line change
 CONFIG_FILE?=config-files/config.yaml
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 -OPERATOR_VERSION=v0.10.2
 +OPERATOR_VERSION=v0.10.3
 ifeq ($(OS),Linux)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_linux

Comments

(0)