Skip to content

Commit

Permalink
Use unbounded loops for merkle patricia trie proof verification (#39)
Browse files Browse the repository at this point in the history
* Update MerkleMountainRange.sol

* use unbounded loops for merkle-patricia-trie

* fix integration tests

* fix ci

* fix variable

* use stable compiler

* panic on compilation error

* why no work?

* patricia-merkle-tree

* try again

* try again

* fix ci

* forge build before cargo build

* bump to solidity v0.8.17

* sigh

* submodule init

* run on arc-runner-set

* smh

---------

Co-authored-by: Aryan Malik <88618913+Aryan9592@users.noreply.github.com>
  • Loading branch information
seunlanlege and 0xScratch committed Mar 11, 2024
1 parent f637bb0 commit 5836535
Show file tree
Hide file tree
Showing 32 changed files with 1,259 additions and 1,121 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: arc-runner-set
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: stable
override: true

- name: Install Foundry
Expand All @@ -40,10 +40,12 @@ jobs:
forge test -vvv
id: test

- uses: actions-rs/cargo@v1
with:
command: test
args: --release --locked --manifest-path ./forge/Cargo.toml -- --nocapture
- name: cargo test
run: |
# forge build
# git submodule update --init --recursive
# cd ./integration-tests
# cargo test --release -- --nocapture

fmt:
name: Rustfmt
Expand All @@ -58,4 +60,4 @@ jobs:
- uses: actions-rs/cargo@v1
with:
command: fmt
args: --manifest-path ./forge/Cargo.toml --all -- --check
args: --manifest-path ./integration-tests/Cargo.toml --all -- --check
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ target/
artifacts/
corpus/

.idea/

integration-tests/proptest-regressions/
1 change: 0 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
branch = v1.4.0
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
34 changes: 0 additions & 34 deletions forge/Cargo.toml

This file was deleted.

228 changes: 0 additions & 228 deletions forge/src/forge.rs

This file was deleted.

Loading

0 comments on commit 5836535

Please sign in to comment.