Skip to content

refactor(repo): move contract bindings crate #1284

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.

Sign up for GitHub

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

Closed
drahnr wants to merge 2 commits into from
Closed

refactor(repo): move contract bindings crate #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1ce7e
refactor: move binding crate out contracts
drahnr Feb 14, 2025
599cc2c
dummy
drahnr Feb 17, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
with:
path: |
./contracts/out
./contracts/bindings
./contract-bindings
./contracts/cache
## TODO maybe add the rust version and solc version to the key
key: v2-contracts-abi-${{ hashFiles('./contracts/**/*.sol') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/contracts-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
path: |
./contracts/out
./contracts/bindings
./contract-bindings
./contracts/cache
key: v2-contracts-abi-${{ hashFiles('./contracts/**/*.sol') }}

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/tests-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
path: |
./contracts/out
./contracts/bindings
./contract-bindings
./contracts/cache
key: v2-contracts-abi-${{ hashFiles('./contracts/**/*.sol') }}

Expand All @@ -50,4 +50,3 @@ jobs:

- name: Run e2e tests
run: cd fendermint && PROFILE=release make e2e-only

3 changes: 1 addition & 2 deletions .github/workflows/tests-unit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
path: |
./contracts/out
./contracts/bindings
./contract-bindings
./contracts/cache
key: v2-contracts-abi-${{ hashFiles('./contracts/**/*.sol') }}

Expand All @@ -39,4 +39,3 @@ jobs:

- name: Run unit tests
run: make test-rust

106 changes: 88 additions & 18 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
resolver = "2"
members = [
# contracts
"contracts/binding",
"contract-bindings",

# merkle
"ext/merkle-tree-rs",
Expand Down Expand Up @@ -184,7 +184,7 @@ ipc-wallet = { path = "ipc/wallet", features = ["with-ethers"] }
ipc_ipld_resolver = { path = "ipld/resolver" }
ipc-types = { path = "ipc/types" }
ipc-observability = { path = "ipc/observability" }
ipc_actors_abis = { path = "contracts/binding" }
ipc_actors_abis = { path = "contract-bindings" }
fendermint_actors_api = { path = "fendermint/actors/api" }

# Vendored for cross-compilation, see https://github.com/cross-rs/cross/wiki/Recipes#openssl
Expand All @@ -195,7 +195,7 @@ openssl = { version = "0.10", features = ["vendored"] }

# NOTE: When upgrading the FVM it may cause our fendermint/actors/build.rs to fail as it can
# pull in crates as transitive dependencies that do not support Wasm architector. If this
# happens, try removing "crypto" feature from fvm_shared dependency in contracts/binding/Cargo.toml
# happens, try removing "crypto" feature from fvm_shared dependency in contract-bindings/Cargo.toml
# and run `cargo build`. Then add the "crypto" feature back and run `cargo build` again.
fvm = { version = "4.4.0", features = [
"verify-signature",
Expand Down
1 change: 1 addition & 0 deletions contract-bindings/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/gen
7 changes: 5 additions & 2 deletions contracts/binding/Cargo.toml → contract-bindings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ipc_actors_abis"
description = "Rust bindings for the IPC Solidity Actors"
description = "Rust contract-bindings for the IPC Solidity Actors"
version = "0.1.0"
authors = ["Protocol Labs"]
edition = "2021"
Expand All @@ -14,4 +14,7 @@ fs-err = { workspace = true }

[build-dependencies]
ethers = { workspace = true, features = ["abigen", "ws"] }
fs-err = { workspace = true }
prettyplease = { version = "0.2" }
syn = { version = "2" }
fs-err = { version = "3" }
color-eyre = "0.6"
Loading
Loading