Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Lagrange-Labs/mapreduce-plonky2
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 65e22517f6c4e8dba32e450db980f2325874d273
Choose a base ref
..
head repository: Lagrange-Labs/mapreduce-plonky2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 083e0ca0c18c11d5aaa0f8d796ae1bc4ff880053
Choose a head ref
Showing with 1,063 additions and 1,059 deletions.
  1. +33 −29 .github/workflows/rust.yml
  2. +344 −334 Cargo.lock
  3. +10 −18 devenv.lock
  4. +26 −0 docker/base/Dockerfile
  5. +77 −131 groth16-framework/test_data/Groth16VerifierExtensions.sol
  6. +0 −1 groth16-framework/tests/common/query.rs
  7. +1 −1 inspect/src/repl.rs
  8. +3 −3 mp2-common/src/array.rs
  9. +1 −1 mp2-common/src/eth.rs
  10. +2 −1 mp2-common/src/keccak.rs
  11. +5 −5 mp2-common/src/merkle_tree/state_tree.rs
  12. +1 −1 mp2-common/src/mpt_sequential/mod.rs
  13. +4 −2 mp2-common/src/proof.rs
  14. +1 −0 mp2-common/src/rlp.rs
  15. +12 −7 mp2-common/src/storage_key.rs
  16. +1 −0 mp2-common/src/types.rs
  17. +7 −2 mp2-common/src/utils.rs
  18. +2 −5 mp2-test/src/circuit.rs
  19. +2 −2 mp2-v1/src/block_extraction/public_inputs.rs
  20. +3 −3 mp2-v1/src/contract_extraction/api.rs
  21. +1 −1 mp2-v1/src/contract_extraction/branch.rs
  22. +1 −1 mp2-v1/src/contract_extraction/extension.rs
  23. +4 −4 mp2-v1/src/contract_extraction/public_inputs.rs
  24. +4 −5 mp2-v1/src/final_extraction/base_circuit.rs
  25. +1 −1 mp2-v1/src/final_extraction/lengthed_circuit.rs
  26. +5 −5 mp2-v1/src/final_extraction/public_inputs.rs
  27. +2 −0 mp2-v1/src/indexing/row.rs
  28. +2 −3 mp2-v1/src/length_extraction/branch.rs
  29. +1 −1 mp2-v1/src/length_extraction/extension.rs
  30. +2 −2 mp2-v1/src/length_extraction/leaf.rs
  31. +3 −3 mp2-v1/src/length_extraction/public_inputs.rs
  32. +23 −28 mp2-v1/src/values_extraction/api.rs
  33. +34 −27 mp2-v1/src/values_extraction/branch.rs
  34. +1 −1 mp2-v1/src/values_extraction/extension.rs
  35. +1 −1 mp2-v1/src/values_extraction/mod.rs
  36. +3 −3 mp2-v1/src/values_extraction/public_inputs.rs
  37. +1 −1 mp2-v1/tests/common/cases/indexing.rs
  38. +21 −30 mp2-v1/tests/common/cases/planner.rs
  39. +34 −36 mp2-v1/tests/common/cases/query.rs
  40. +1 −1 mp2-v1/tests/common/celltree.rs
  41. +2 −5 mp2-v1/tests/common/contract_extraction.rs
  42. +3 −3 mp2-v1/tests/common/index_tree.rs
  43. +1 −1 mp2-v1/tests/common/length_extraction.rs
  44. +2 −2 mp2-v1/tests/common/mod.rs
  45. +1 −1 mp2-v1/tests/common/rowtree.rs
  46. +3 −3 mp2-v1/tests/common/storage_trie.rs
  47. +1 −1 mp2-v1/tests/common/table.rs
  48. +2 −3 mp2-v1/tests/common/values_extraction.rs
  49. +3 −0 parsil/src/lib.rs
  50. +7 −9 recursion-framework/src/circuit_builder.rs
  51. +4 −4 recursion-framework/src/framework.rs
  52. +2 −2 recursion-framework/src/framework_testing.rs
  53. +2 −2 recursion-framework/src/universal_verifier_gadget/verifier_gadget.rs
  54. +1 −1 recursion-framework/src/universal_verifier_gadget/wrap_circuit.rs
  55. +1 −1 recursion-framework/tests/integration.rs
  56. +1 −1 ryhope/src/lib.rs
  57. +6 −4 ryhope/src/storage/memory.rs
  58. +3 −3 ryhope/src/storage/mod.rs
  59. +10 −27 ryhope/src/storage/pgsql/mod.rs
  60. +199 −149 ryhope/src/storage/pgsql/storages.rs
  61. +20 −17 ryhope/src/storage/tests.rs
  62. +1 −1 ryhope/src/storage/updatetree.rs
  63. +2 −2 ryhope/src/tests/trees.rs
  64. +3 −2 ryhope/src/tree/mod.rs
  65. +4 −8 ryhope/src/tree/sbbst.rs
  66. +1 −1 verifiable-db/src/block_tree/membership.rs
  67. +1 −1 verifiable-db/src/block_tree/parent.rs
  68. +4 −4 verifiable-db/src/block_tree/public_inputs.rs
  69. +1 −1 verifiable-db/src/cells_tree/full_node.rs
  70. +1 −1 verifiable-db/src/cells_tree/partial_node.rs
  71. +5 −5 verifiable-db/src/cells_tree/public_inputs.rs
  72. +4 −4 verifiable-db/src/extraction.rs
  73. +5 −5 verifiable-db/src/ivc/public_inputs.rs
  74. +2 −2 verifiable-db/src/query/aggregation/child_proven_single_path_node.rs
  75. +2 −2 verifiable-db/src/query/aggregation/embedded_tree_proven_single_path_node.rs
  76. +1 −1 verifiable-db/src/query/aggregation/full_node_index_leaf.rs
  77. +1 −1 verifiable-db/src/query/aggregation/full_node_with_one_child.rs
  78. +1 −1 verifiable-db/src/query/aggregation/full_node_with_two_children.rs
  79. +4 −4 verifiable-db/src/query/aggregation/mod.rs
  80. +8 −8 verifiable-db/src/query/aggregation/non_existence_inter.rs
  81. +1 −1 verifiable-db/src/query/aggregation/partial_node.rs
  82. +9 −12 verifiable-db/src/query/api.rs
  83. +1 −2 verifiable-db/src/query/computational_hash_ids.rs
  84. +4 −4 verifiable-db/src/query/public_inputs.rs
  85. +1 −1 verifiable-db/src/query/universal_circuit/universal_circuit_inputs.rs
  86. +11 −11 verifiable-db/src/query/universal_circuit/universal_query_circuit.rs
  87. +1 −1 verifiable-db/src/results_tree/binding/binding_results.rs
  88. +4 −4 verifiable-db/src/results_tree/binding/public_inputs.rs
  89. +1 −1 verifiable-db/src/results_tree/construction/leaf_node.rs
  90. +1 −1 verifiable-db/src/results_tree/construction/node_with_one_child.rs
  91. +1 −1 verifiable-db/src/results_tree/construction/node_with_two_children.rs
  92. +4 −4 verifiable-db/src/results_tree/construction/public_inputs.rs
  93. +1 −1 verifiable-db/src/results_tree/construction/results_tree_with_duplicates.rs
  94. +1 −1 verifiable-db/src/results_tree/construction/results_tree_without_duplicates.rs
  95. +7 −11 verifiable-db/src/revelation/api.rs
  96. +5 −5 verifiable-db/src/revelation/public_inputs.rs
  97. +1 −1 verifiable-db/src/revelation/revelation_without_results_tree.rs
  98. +4 −4 verifiable-db/src/row_tree/public_inputs.rs
62 changes: 33 additions & 29 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -8,42 +8,46 @@ on:
name: Check, Test, and Format

jobs:
fmt:
runs-on: ['memory:8GB']
base:
name: build base
runs-on: ['hostname:hetzner-dedicated-6']
outputs:
RUNNER: ${{ steps.get-label.outputs.runner_name }}
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Install devenv
- name: Get Runner Label
id: get-label
run: |
if [ -e /nix/var/nix/profiles/default/bin/nix-env ]
then
/nix/var/nix/profiles/default/bin/nix-env -if https://github.com/cachix/devenv/tarball/latest
if [[ "${{ runner.name }}" == *"@hetzner-dedicated-6" ]]; then
echo "runner_name=hostname:hetzner-dedicated-6" >> $GITHUB_OUTPUT
else
nix-env -if https://github.com/cachix/devenv/tarball/latest
echo "runner_name=nix-128g" >> $GITHUB_OUTPUT
fi
echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
- name: Run cargo test
shell: devenv shell bash -- -e {0}
run: cargo fmt --all -- --check #
- name: Cleanup docker build cache
run: |
docker system prune --force
docker builder prune --all --force
- name: Checkout code
uses: actions/checkout@v4

check:
name: Check
runs-on: ['memory:8GB']
- name: Build base
env:
DOCKER_BUILDKIT: 1
run: |
docker build --tag base --file docker/base/Dockerfile . --platform linux/amd64 --build-arg INSTRUCTION_SET="x86-64-v3"
clippy-fmt-check:
needs: base
runs-on: ${{needs.base.outputs.RUNNER}}
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Install devenv

- name: clippy
run: |
if [ -e /nix/var/nix/profiles/default/bin/nix-env ]
then
/nix/var/nix/profiles/default/bin/nix-env -if https://github.com/cachix/devenv/tarball/latest
else
nix-env -if https://github.com/cachix/devenv/tarball/latest
fi
echo "$HOME/.nix-profile/bin" >> $GITHUB_PATH
- name: Run cargo check
shell: devenv shell bash -- -e {0}
run: cargo check --tests
docker run --rm base cargo clippy --all-targets --all -- -D warnings -A incomplete-features -A clippy::needless_return -A clippy::too_long_first_doc_paragraph -A clippy::await_holding_lock
- name: fmt
run: |
docker run --rm base cargo fmt --all -- --check
- name: check
run: |
docker run --rm base cargo check --tests
test:
name: Test Suite
Loading