Skip to content

Commit

Permalink
chore: improve workspace dependency management
Browse files Browse the repository at this point in the history
  • Loading branch information
@bidzyyys
bidzyyys committed Sep 11, 2024
1 parent ef3b344 commit 7a70440
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 36 deletions.
13 changes: 1 addition & 12 deletions Cargo.lock
View file

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

8 changes: 8 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ syn = { version = "2.0.58", features = ["full"] }
proc-macro2 = "1.0.79"
quote = "1.0.35"

# members
openzeppelin-stylus = { path = "contracts" }
openzeppelin-crypto = { path = "lib/crypto" }
motsu = { path = "lib/motsu"}
motsu-proc = { path = "lib/motsu-proc", version = "0.1.0" }
e2e = { path = "lib/e2e" }
e2e-proc = {path = "lib/e2e-proc"}

[profile.release]
codegen-units = 1
panic = "abort"
Expand Down
4 changes: 2 additions & 2 deletions benches/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives = { workspace = true, features = ["tiny-keccak"] }
alloy.workspace = true
tokio.workspace = true
eyre.workspace = true
koba.workspace = true
e2e = { path = "../lib/e2e" }
e2e.workspace = true
serde = "1.0.203"
keccak-const = "0.2.0"
2 changes: 1 addition & 1 deletion contracts/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ keccak-const.workspace = true

[dev-dependencies]
alloy-primitives = { workspace = true, features = ["arbitrary"] }
motsu = { path = "../lib/motsu" }
motsu.workspace = true
rand.workspace = true

[features]
Expand Down
4 changes: 2 additions & 2 deletions examples/access-control/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion examples/basic/token/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions examples/ecdsa/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions examples/erc20-permit/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives = { workspace = true, features = ["tiny-keccak"] }
stylus-sdk.workspace = true
stylus-proc.workspace = true
Expand All @@ -17,7 +17,7 @@ mini-alloc.workspace = true
alloy.workspace = true
eyre.workspace = true
tokio.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true

[features]
e2e = []
Expand Down
4 changes: 2 additions & 2 deletions examples/erc20/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
Expand All @@ -17,7 +17,7 @@ mini-alloc.workspace = true
alloy.workspace = true
eyre.workspace = true
tokio.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true

[features]
e2e = []
Expand Down
4 changes: 2 additions & 2 deletions examples/erc721-consecutive/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
alloy-sol-types.workspace = true
stylus-sdk.workspace = true
Expand All @@ -16,7 +16,7 @@ mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true
rand.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions examples/erc721-metadata/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true
rand.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions examples/erc721/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true
rand.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion examples/merkle-proofs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-crypto = { path = "../../lib/crypto" }
openzeppelin-crypto.workspace = true
alloy-primitives.workspace = true
alloy-sol-types.workspace = true
stylus-sdk.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions examples/ownable/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ publish = false
version = "0.0.0"

[dependencies]
openzeppelin-stylus = { path = "../../contracts" }
openzeppelin-stylus.workspace = true
alloy-primitives.workspace = true
stylus-sdk.workspace = true
stylus-proc.workspace = true
mini-alloc.workspace = true

[dev-dependencies]
alloy.workspace = true
e2e = { path = "../../lib/e2e" }
e2e.workspace = true
tokio.workspace = true
eyre.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion lib/e2e/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ eyre.workspace = true
regex.workspace = true
once_cell.workspace = true
koba.workspace = true
e2e-proc = { path = "../e2e-proc" }
e2e-proc.workspace = true
toml = "0.8.13"

[lints]
Expand Down
2 changes: 1 addition & 1 deletion lib/motsu-proc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ quote.workspace = true
syn.workspace = true

[dev-dependencies]
motsu = { path = "../motsu" }
motsu.workspace = true
alloy-primitives.workspace = true
alloy-sol-types.workspace = true
stylus-sdk.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion lib/motsu/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const-hex.workspace = true
once_cell.workspace = true
tiny-keccak.workspace = true
stylus-sdk.workspace = true
motsu-proc = "0.1.0"
motsu-proc.workspace = true

[lints]
workspace = true

0 comments on commit 7a70440

Please sign in to comment.