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

Improve code for next documentation update. #434

Merged
merged 40 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
75a4e1c
chore: remove EVM config
drewstone Oct 30, 2024
7df36ec
chore: attempt to remove hardcoded operator id
drewstone Oct 30, 2024
b70e529
chore: fix fmt and ensure eigen test works
drewstone Oct 30, 2024
6d4c597
chore: merge main
drewstone Nov 4, 2024
d3e4ffa
chore: add colima try and fix CI for eigen
drewstone Nov 4, 2024
7b3536f
chore: remove old files from merge
drewstone Nov 4, 2024
6f7bff4
chore: remove old files from merge
drewstone Nov 4, 2024
7d937e4
chore: remove old fn
drewstone Nov 4, 2024
4880631
chore: attempt fix for docker
drewstone Nov 4, 2024
0134527
chore: fix comment
drewstone Nov 4, 2024
a86013e
chore: fix docker
drewstone Nov 4, 2024
1b648d7
chore: fix docker
drewstone Nov 4, 2024
be75793
chore: fix docker
drewstone Nov 4, 2024
4ce2329
chore: fix docker
drewstone Nov 4, 2024
c50305d
chore: fix docker
drewstone Nov 4, 2024
a0335f4
chore: fix docker
drewstone Nov 4, 2024
5ed68d5
chore: fix docker update isq blueprint
drewstone Nov 5, 2024
76bb328
feat: fix service instance design
drewstone Nov 5, 2024
57d56f7
chore: fix docker and fm
drewstone Nov 5, 2024
214d6db
chore: attempt another fix
drewstone Nov 5, 2024
bf54f9d
chore: remove old blueprints and modules
drewstone Nov 5, 2024
a535534
chore: fix sdk readme
drewstone Nov 5, 2024
a9414af
chore: merge examples into one blueprint
drewstone Nov 5, 2024
679ef9b
chore: fix toml
drewstone Nov 5, 2024
b6c61f8
chore: fix clippy
drewstone Nov 5, 2024
781960d
chore: merge main
drewstone Nov 5, 2024
0763856
chore: fix docker
drewstone Nov 5, 2024
26ce72d
chore: fix docker
drewstone Nov 5, 2024
ec4d81a
chore: fix naming
drewstone Nov 5, 2024
07cf3b1
chore: fix clippy
drewstone Nov 5, 2024
9437099
chore: attempt docker fix
drewstone Nov 5, 2024
caa9e3e
chore: attempt fix
drewstone Nov 5, 2024
09392f1
chore: forge init
drewstone Nov 5, 2024
9ea480c
forge install: forge-std
drewstone Nov 5, 2024
a3cce07
chore: attempt fix
drewstone Nov 6, 2024
6067551
chore: attempt fix
drewstone Nov 6, 2024
9b1079e
chore: attempt fix
drewstone Nov 6, 2024
ae9e7d7
chore: remove macos env var setting
drewstone Nov 6, 2024
953fdfe
chore: merge main
drewstone Nov 6, 2024
97e557b
chore: fix
drewstone Nov 6, 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
28 changes: 12 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,28 @@ jobs:

integration-test-eigenlayer:
timeout-minutes: 90
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v2

- name: Install Foundry
run: |
curl -L https://foundry.paradigm.xyz | bash
source /Users/runner/.bashrc
foundryup
${FOUNDRY_DIR:-"$HOME/.foundry"}/bin/foundryup
env:
FOUNDRY_DIR: ${{ runner.temp }}/foundry
shell: bash

- name: Add Foundry to PATH
run: echo "${HOME}/.foundry/bin" >> $GITHUB_PATH
run: echo "${{ runner.temp }}/foundry/bin" >> $GITHUB_PATH


- name: Forge build
run: forge update && cd blueprints/incredible-squaring-eigenlayer && forge build --root ./contracts && cd ../../

- name: setup-docker
run: brew install docker

- name: Verify Forge and Docker installation
run: forge --version && docker --version
- name: Set up Docker
uses: crazy-max/ghaction-setup-docker@v3

- name: Run anvil in background
run: anvil --version && anvil &
Expand All @@ -160,13 +160,10 @@ jobs:
with:
cache-on-failure: "true"

- name: install protobuf
run: brew install protobuf gmp

- name: Set Relevant M1 env vars
- name: install protobuf and gmp
run: |
export LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/lib
export INCLUDE_PATH=$INCLUDE_PATH:/opt/homebrew/include
sudo apt-get update
sudo apt-get install -y protobuf-compiler libprotobuf-dev libgmp-dev

- name: install cargo-nextest
run: cargo install cargo-nextest --locked
Expand All @@ -176,4 +173,3 @@ jobs:

- name: tests
run: RUST_LOG=gadget=trace cargo test --package blueprint-test-utils test_eigenlayer_incredible_squaring_blueprint -- --nocapture

12 changes: 4 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@
path = blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std

# For the ecdsa-threshold-mpc blueprint
[submodule "blueprints/ecdsa-threshold-mpc/contracts/lib/forge-std"]
path = blueprints/ecdsa-threshold-mpc/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "blueprints/ecdsa-threshold-mpc/contracts/lib/tnt-core"]
path = blueprints/ecdsa-threshold-mpc/contracts/lib/tnt-core
url = https://github.com/tangle-network/tnt-core
branch = main
# For the incredible-squaring-symbiotic blueprint
[submodule "blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std"]
path = blueprints/incredible-squaring-symbiotic/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "blueprints/incredible-squaring-symbiotic/contracts/lib/core"]
path = blueprints/incredible-squaring-symbiotic/contracts/lib/core
url = https://github.com/symbioticfi/core
[submodule "blueprints/examples/contracts/lib/forge-std"]
path = blueprints/examples/contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
112 changes: 75 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ members = [
"blueprints/incredible-squaring",
"blueprints/incredible-squaring-eigenlayer",
"blueprints/incredible-squaring-symbiotic",
"blueprints/periodic-web-poller",
"blueprints/tangle-raw-event-listener",
"blueprints/examples",
"cli",
"gadget-io",
"blueprint-test-utils",
Expand Down Expand Up @@ -54,8 +53,7 @@ gadget-sdk = { path = "./sdk", default-features = false, version = "0.3.0" }
incredible-squaring-blueprint = { path = "./blueprints/incredible-squaring", default-features = false, version = "0.1.1" }
incredible-squaring-blueprint-eigenlayer = { path = "./blueprints/incredible-squaring-eigenlayer", default-features = false, version = "0.1.1" }
incredible-squaring-blueprint-symbiotic = { path = "./blueprints/incredible-squaring-symbiotic", default-features = false, version = "0.1.1" }
periodic-web-poller-blueprint = { path = "./blueprints/periodic-web-poller", default-features = false, version = "0.1.1" }
tangle-raw-event-listener-blueprint = { path = "./blueprints/tangle-raw-event-listener", default-features = false, version = "0.1.1" }
blueprint-examples = { path = "./blueprints/examples", default-features = false, version = "0.1.1" }
gadget-blueprint-proc-macro = { path = "./macros/blueprint-proc-macro", default-features = false, version = "0.3.0" }
gadget-blueprint-proc-macro-core = { path = "./macros/blueprint-proc-macro-core", default-features = false, version = "0.1.5" }
gadget-context-derive = { path = "./macros/context-derive", default-features = false, version = "0.2.0" }
Expand Down
30 changes: 0 additions & 30 deletions blueprints/ecdsa-threshold-mpc/.gitignore

This file was deleted.

43 changes: 0 additions & 43 deletions blueprints/ecdsa-threshold-mpc/Cargo.toml

This file was deleted.

24 changes: 0 additions & 24 deletions blueprints/ecdsa-threshold-mpc/LICENSE

This file was deleted.

Loading
Loading