Skip to content

Commit

Permalink
chore: specify all dependencies in the workspace (#1341)
Browse files Browse the repository at this point in the history 
- This makes it easier to update them and makes dependency upgrade diffs
smaller.
- Reduces rebase conflicts.
- Reduces accidental duplicate dependencies (different versions).
  • Loading branch information
@Stebalien
Stebalien authored Jul 25, 2023
1 parent 8e82ef7 commit a77674d
Show file tree
Hide file tree
Showing 22 changed files with 508 additions and 1,094 deletions.
790 changes: 63 additions & 727 deletions Cargo.lock
View file

Large diffs are not rendered by default.

121 changes: 102 additions & 19 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@ exclude = ["examples", ".github"]
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fil_actor_account = { version = "12.0.0", path = "./actors/account", features = ["fil-actor"] }
fil_actor_cron = { version = "12.0.0", path = "./actors/cron", features = ["fil-actor"] }
fil_actor_datacap = { version = "12.0.0", path = "./actors/datacap", features = ["fil-actor"] }
fil_actor_ethaccount = { version = "12.0.0", path = "actors/ethaccount", features = ["fil-actor"] }
fil_actor_eam = { version = "12.0.0", path = "./actors/eam", features = ["fil-actor"] }
fil_actor_evm = { version = "12.0.0", path = "./actors/evm", features = ["fil-actor"] }
fil_actor_init = { version = "12.0.0", path = "./actors/init", features = ["fil-actor"] }
fil_actor_market = { version = "12.0.0", path = "./actors/market", features = ["fil-actor"] }
fil_actor_miner = { version = "12.0.0", path = "./actors/miner", features = ["fil-actor"] }
fil_actor_multisig = { version = "12.0.0", path = "./actors/multisig", features = ["fil-actor"] }
fil_actor_paych = { version = "12.0.0", path = "./actors/paych", features = ["fil-actor"] }
fil_actor_placeholder = { version = "12.0.0", path = "./actors/placeholder", features = ["fil-actor"] }
fil_actor_power = { version = "12.0.0", path = "./actors/power", features = ["fil-actor"] }
fil_actor_reward = { version = "12.0.0", path = "./actors/reward", features = ["fil-actor"] }
fil_actor_system = { version = "12.0.0", path = "./actors/system", features = ["fil-actor"] }
fil_actor_verifreg = { version = "12.0.0", path = "./actors/verifreg", features = ["fil-actor"] }
fil_actor_account = { workspace = true, features = ["fil-actor"] }
fil_actor_cron = { workspace = true, features = ["fil-actor"] }
fil_actor_datacap = { workspace = true, features = ["fil-actor"] }
fil_actor_ethaccount = { workspace = true, features = ["fil-actor"] }
fil_actor_eam = { workspace = true, features = ["fil-actor"] }
fil_actor_evm = { workspace = true, features = ["fil-actor"] }
fil_actor_init = { workspace = true, features = ["fil-actor"] }
fil_actor_market = { workspace = true, features = ["fil-actor"] }
fil_actor_miner = { workspace = true, features = ["fil-actor"] }
fil_actor_multisig = { workspace = true, features = ["fil-actor"] }
fil_actor_paych = { workspace = true, features = ["fil-actor"] }
fil_actor_placeholder = { workspace = true, features = ["fil-actor"] }
fil_actor_power = { workspace = true, features = ["fil-actor"] }
fil_actor_reward = { workspace = true, features = ["fil-actor"] }
fil_actor_system = { workspace = true, features = ["fil-actor"] }
fil_actor_verifreg = { workspace = true, features = ["fil-actor"] }

[build-dependencies]
fil_actor_bundler = "5.0.0"
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
fil_actors_runtime = { version = "12.0.0", path = "runtime" }
num-traits = "0.2.15"
cid = { workspace = true }
fil_actors_runtime = { workspace = true }
num-traits = { workspace = true }

[dependencies]
clap = { version = "3.2.3", features = ["derive"] }
Expand All @@ -58,6 +58,89 @@ members = [
"test_vm",
]

[workspace.dependencies]
# Common
serde = { version = "1.0.136", features = ["derive"] }
anyhow = "1.0.65"
num = { version = "0.4", features = ["serde"] }
num-derive = "0.3.3"
num-traits = "0.2.14"
lazy_static = "1.4.0"
log = { version = "0.4.14", features = ["std"] }
byteorder = "1.4.3"
itertools = "0.10.3"
indexmap = { version = "1.8.0", features = ["serde-1"] }
derive_builder = "0.10.2"
once_cell = "1.17.0"
rand = { version = "0.8.5", default-features = false }
hex = "0.4.3"
hex-literal = "0.3.4"
serde_json = "1.0"
regex = "1"
test-case = "2.2.1"
bimap = "0.6.2"
castaway = "0.2.2"
paste = "1.0.9"
thiserror = "1.0.30"
pretty_env_logger = "0.4.0"
serde_repr = "0.1.8"
unsigned-varint = "0.7.1"
rand_chacha = "0.3.1"

# Crypto
libsecp256k1 = { version = "0.7.1", default-features = false }
blake2b_simd = "1.0"
sha2 = "0.10"

# EVM
ethers = { version = "1.0.2", features = ["abigen"] }
uint = { version = "0.9.3", default-features = false }
etk-asm = "^0.2.1"
rlp = { version = "0.5.1", default-features = false }
substrate-bn = { version = "0.6.0", default-features = false }

# IPLD/Encoding
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
multihash = { version = "0.18.1", default-features = false }
libipld-core = { version = "0.13.1", features = ["serde-codec"] }
integer-encoding = { version = "3.0.3", default-features = false }

# helix-onchain
fvm_actor_utils = "7.0.0"
frc42_dispatch = "3.3.0"
frc46_token = "7.0.0"

# FVM
fvm_sdk = "~3.3.0"
fvm_shared = "~3.4.0"
fvm_ipld_encoding = "0.4.0"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_hamt = "0.7.0"
fvm_ipld_kamt = "0.3.0"
fvm_ipld_amt = { version = "0.6.1", features = ["go-interop"] }
fvm_ipld_bitfield = "0.5.4"

# workspace
fil_actor_account = { version = "12.0.0", path = "actors/account" }
fil_actor_cron = { version = "12.0.0", path = "actors/cron" }
fil_actor_datacap = { version = "12.0.0", path = "actors/datacap" }
fil_actor_eam = { version = "12.0.0", path = "actors/eam" }
fil_actor_ethaccount = { version = "12.0.0", path = "actors/ethaccount" }
fil_actor_evm = { version = "12.0.0", path = "actors/evm" }
fil_actor_init = { version = "12.0.0", path = "actors/init" }
fil_actor_market = { version = "12.0.0", path = "actors/market" }
fil_actor_miner = { version = "12.0.0", path = "actors/miner" }
fil_actor_multisig = { version = "12.0.0", path = "actors/multisig" }
fil_actor_paych = { version = "12.0.0", path = "actors/paych" }
fil_actor_placeholder = { version = "12.0.0", path = "actors/placeholder" }
fil_actor_power = { version = "12.0.0", path = "actors/power" }
fil_actor_reward = { version = "12.0.0", path = "actors/reward" }
fil_actor_system = { version = "12.0.0", path = "actors/system" }
fil_actor_verifreg = { version = "12.0.0", path = "actors/verifreg" }
fil_actors_evm_shared = { version = "12.0.0", path = "actors/evm/shared" }
fil_actors_runtime = { version = "12.0.0", path = "runtime" }
fil_builtin_actors_state = { version = "12.0.0", path = "state"}

[patch.crates-io]
#fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
#fvm_sdk = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
Expand Down
22 changes: 11 additions & 11 deletions actors/account/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ keywords = ["filecoin", "web3", "wasm"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
frc42_dispatch = "3.3.0"
fvm_actor_utils = "7.0.0"
fvm_shared = { version = "3.4.0", default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
num-traits = "0.2.14"
num-derive = "0.3.3"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_encoding = "0.4.0"
anyhow = "1.0.65"
fil_actors_runtime = { workspace = true }
frc42_dispatch = { workspace = true }
fvm_actor_utils = { workspace = true }
fvm_shared = { workspace = true }
serde = { workspace = true }
num-traits = { workspace = true }
num-derive = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
anyhow = { workspace = true }

[dev-dependencies]
fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
18 changes: 9 additions & 9 deletions actors/cron/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ keywords = ["filecoin", "web3", "wasm"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
fvm_shared = { version = "3.4.0", default-features = false }
num-traits = "0.2.14"
num-derive = "0.3.3"
log = "0.4.14"
serde = { version = "1.0.136", features = ["derive"] }
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_encoding = "0.4.0"
fil_actors_runtime = { workspace = true }
fvm_shared = { workspace = true }
num-traits = { workspace = true }
num-derive = { workspace = true }
log = { workspace = true }
serde = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }

[dev-dependencies]
fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
30 changes: 15 additions & 15 deletions actors/datacap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ keywords = ["filecoin", "web3", "wasm"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime"}
fil_actors_runtime = { workspace = true}

cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
frc42_dispatch = "3.3.0"
frc46_token = "7.0.0"
fvm_actor_utils = "7.0.0"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_encoding = "0.4.0"
fvm_ipld_hamt = "0.7.0"
fvm_shared = { version = "3.4.0", default-features = false }
lazy_static = "1.4.0"
num-derive = "0.3.3"
num-traits = "0.2.14"
serde = { version = "1.0.136", features = ["derive"] }
log = "0.4.14"
cid = { workspace = true }
frc42_dispatch = { workspace = true }
frc46_token = { workspace = true }
fvm_actor_utils = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
fvm_ipld_hamt = { workspace = true }
fvm_shared = { workspace = true }
lazy_static = { workspace = true }
num-derive = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
log = { workspace = true }

[dev-dependencies]
fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }
[features]
fil-actor = ["fil_actors_runtime/fil-actor"]

33 changes: 16 additions & 17 deletions actors/eam/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,24 @@ keywords = ["filecoin", "web3", "wasm", "evm"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
serde = { version = "1.0.136", features = ["derive"] }
serde_tuple = "0.5"
rlp = { version = "0.5.1", default-features = false }
anyhow = "1.0.65"
log = "0.4.14"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_encoding = "0.4.0"
multihash = { version = "0.18.1", default-features = false }
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
fvm_shared = { version = "3.4.0", default-features = false }
num-traits = "0.2.15"
num-derive = "0.3.3"
hex-literal = "0.3.4"
fil_actors_evm_shared = { version = "12.0.0", path = "../evm/shared" }
anyhow = { workspace = true }
cid = { workspace = true }
fil_actors_evm_shared = { workspace = true }
fil_actors_runtime = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
fvm_shared = { workspace = true }
log = { workspace = true }
multihash = { workspace = true }
num-derive = { workspace = true }
num-traits = { workspace = true }
serde = { workspace = true }
hex-literal = { workspace = true }
rlp = { workspace = true }

[dev-dependencies]
fil_actor_evm = { path = "../evm"}
fil_actors_runtime = { path = "../../runtime", features = ["test_utils"] }
fil_actor_evm = { workspace = true}
fil_actors_runtime = { workspace = true, features = ["test_utils"] }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
20 changes: 10 additions & 10 deletions actors/ethaccount/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ keywords = ["filecoin", "web3", "wasm", "evm"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
frc42_dispatch = "3.3.0"
fvm_actor_utils = "7.0.0"
serde = { version = "1.0.136", features = ["derive"] }
fvm_ipld_encoding = "0.4.0"
fvm_shared = { version = "3.4.0", default-features = false }
num-traits = "0.2.15"
num-derive = "0.3.3"
hex-literal = "0.3.4"
fil_actors_runtime = { workspace = true }
frc42_dispatch = { workspace = true }
fvm_actor_utils = { workspace = true }
serde = { workspace = true }
fvm_ipld_encoding = { workspace = true }
fvm_shared = { workspace = true }
num-traits = { workspace = true }
num-derive = { workspace = true }
hex-literal = { workspace = true }

[dev-dependencies]
fil_actors_runtime = { path = "../../runtime", features = ["test_utils"] }
fil_actors_runtime = { workspace = true, features = ["test_utils"] }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
50 changes: 25 additions & 25 deletions actors/evm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ exclude = ["/precompile-testdata", "/tests/measurements", "/tests/contracts"]
crate-type = ["cdylib", "lib"]

[dependencies]
fil_actors_runtime = { version = "12.0.0", path = "../../runtime" }
fvm_shared = { version = "3.4.0", default-features = false }
fvm_ipld_kamt = { version = "0.3.0" }
serde = { version = "1.0.136", features = ["derive"] }
serde_tuple = "0.5"
num-traits = "0.2.14"
num-derive = "0.3.3"
cid = { version = "0.10.1", default-features = false, features = ["serde-codec"] }
anyhow = "1.0.65"
log = "0.4.14"
fvm_ipld_blockstore = "0.2.0"
fvm_ipld_encoding = "0.4.0"
multihash = { version = "0.18.1", default-features = false }
hex = { version = "0.4.3", features = ["serde"] }
hex-literal = "0.3.4"
substrate-bn = { version = "0.6.0", default-features = false }
frc42_dispatch = "3.3.0"
fil_actors_evm_shared = { version = "12.0.0", path = "shared" }
fil_actors_runtime = { workspace = true }
fvm_shared = { workspace = true }
fvm_ipld_kamt = { workspace = true }
serde = { workspace = true }
num-traits = { workspace = true }
num-derive = { workspace = true }
cid = { workspace = true }
anyhow = { workspace = true }
log = { workspace = true }
fvm_ipld_blockstore = { workspace = true }
fvm_ipld_encoding = { workspace = true }
multihash = { workspace = true }
frc42_dispatch = { workspace = true }
fil_actors_evm_shared = { workspace = true }
hex = { workspace = true }
hex-literal = { workspace = true }
substrate-bn = { workspace = true }

[dev-dependencies]
lazy_static = "1.4.0"
fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
etk-asm = "^0.2.1"
ethers = { version = "1.0.2", features = ["abigen"] }
serde_json = "1.0"
rand = "0.8.5"
once_cell = "1.17.0"
hex = { workspace = true, features = ["serde"] }
lazy_static = { workspace = true }
fil_actors_runtime = { workspace = true, features = ["test_utils", "sector-default"] }
etk-asm = { workspace = true }
ethers = { workspace = true }
serde_json = { workspace = true }
rand = { workspace = true }
once_cell = { workspace = true }

[features]
fil-actor = ["fil_actors_runtime/fil-actor"]
12 changes: 6 additions & 6 deletions actors/evm/shared/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ repository = "https://github.com/filecoin-project/builtin-actors"
keywords = ["filecoin", "web3", "wasm", "evm"]

[dependencies]
serde = { version = "1.0.136", features = ["derive"] }
fvm_shared = { version = "3.4.0", default-features = false }
fil_actors_runtime = { version = "12.0.0", path = "../../../runtime" }
fvm_ipld_encoding = "0.4.0"
uint = { version = "0.9.3", default-features = false }
hex = "0.4.3"
serde = { workspace = true }
fvm_shared = { workspace = true }
fil_actors_runtime = { workspace = true }
fvm_ipld_encoding = { workspace = true }
uint = { workspace = true }
hex = { workspace = true }
1 change: 0 additions & 1 deletion actors/evm/src/state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use cid::Cid;
use fvm_ipld_encoding::strict_bytes;
use fvm_ipld_encoding::tuple::*;
use serde::{Deserialize, Serialize};
use serde_tuple::{Deserialize_tuple, Serialize_tuple};

/// A tombstone indicating that the contract has been self-destructed.
#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)]
Expand Down
Loading

0 comments on commit a77674d

Please sign in to comment.