Skip to content

Commit

Permalink
Merge branch 'release/v4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Stebalien
Stebalien committed Oct 31, 2023
2 parents 1cadcec + 6a248c1 commit 836fd4a
Show file tree
Hide file tree
Showing 25 changed files with 160 additions and 148 deletions.
214 changes: 107 additions & 107 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions fvm/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Changes to the reference FVM implementation.

## [Unreleased]

## 4.0.0 (2023-10-31)

Final release, no changes.

## 4.0.0-alpha.4 (2023-09-28)

- Add back some proof types that were mistakenly removed, and fix some of the constants.
Expand Down
4 changes: 2 additions & 2 deletions fvm/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fvm"
description = "Filecoin Virtual Machine reference implementation"
version = "4.0.0-alpha.4"
version = "4.0.0"
license = "MIT OR Apache-2.0"
authors = ["Protocol Labs", "Filecoin Core Devs"]
edition = "2021"
Expand All @@ -17,7 +17,7 @@ thiserror = "1.0.40"
num-traits = "0.2"
cid = { workspace = true, features = ["serde-codec"] }
multihash = { workspace = true, features = ["sha2", "sha3", "ripemd"] }
fvm_shared = { version = "4.0.0-alpha.4", path = "../shared", features = ["crypto"] }
fvm_shared = { version = "4.0.0", path = "../shared", features = ["crypto"] }
fvm_ipld_hamt = { version = "0.9.0", path = "../ipld/hamt" }
fvm_ipld_amt = { version = "0.6.2", path = "../ipld/amt" }
fvm_ipld_blockstore = { version = "0.2.0", path = "../ipld/blockstore" }
Expand Down
4 changes: 4 additions & 0 deletions sdk/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

## 4.0.0 (2023-10-31)

Final release, no changes.

## 4.0.0-alpha.4 (2023-09-28)

- Add back some proof types that were mistakenly removed, and fix some of the constants.
Expand Down
4 changes: 2 additions & 2 deletions sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fvm_sdk"
description = "Filecoin Virtual Machine actor development SDK"
version = "4.0.0-alpha.4"
version = "4.0.0"
license = "MIT OR Apache-2.0"
authors = ["Protocol Labs", "Filecoin Core Devs"]
edition = "2021"
Expand All @@ -12,7 +12,7 @@ crate-type = ["lib"]

[dependencies]
cid = { workspace = true }
fvm_shared = { version = "4.0.0-alpha.4", path = "../shared" }
fvm_shared = { version = "4.0.0", path = "../shared" }
## num-traits; disabling default features makes it play nice with no_std.
num-traits = { version = "0.2.15", default-features = false }
lazy_static = { version = "1.4.0" }
Expand Down
4 changes: 4 additions & 0 deletions shared/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

## 4.0.0 (2023-10-31)

Final release, no changes.

## 4.0.0-alpha.4 (2023-09-28)

- Add back some proof types that were mistakenly removed, and fix some of the constants.
Expand Down
2 changes: 1 addition & 1 deletion shared/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "fvm_shared"
description = "Filecoin Virtual Machine shared types and functions"
version = "4.0.0-alpha.4"
version = "4.0.0"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
Expand Down
2 changes: 1 addition & 1 deletion testing/calibration/shared/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["Protocol Labs", "Filecoin Core Devs"]
repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../shared", features = ["testing"] }
fvm_shared = { version = "4.0.0", path = "../../../shared", features = ["testing"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
num-traits = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions testing/conformance/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
fvm_shared = { version = "4.0.0-alpha.4", path = "../../shared" }
fvm_shared = { version = "4.0.0", path = "../../shared" }
fvm_ipld_car = { version = "0.7.1", path = "../../ipld/car" }
fvm_ipld_blockstore = { version = "0.2.0", path = "../../ipld/blockstore" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../ipld/encoding" }
Expand Down Expand Up @@ -39,7 +39,7 @@ tar = { version = "0.4.38", default-features = false }
zstd = { version = "0.12.3", default-features = false }

[dependencies.fvm]
version = "4.0.0-alpha.4"
version = "4.0.0"
path = "../../fvm"
default-features = false
features = ["testing"]
Expand Down
6 changes: 3 additions & 3 deletions testing/integration/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "fvm_integration_tests"
description = "Filecoin Virtual Machine integration tests framework"
version = "4.0.0-alpha.4"
version = "4.0.0"
edition = "2021"
license = "MIT OR Apache-2.0"
authors = ["Protocol Labs", "Filecoin Core Devs", "Polyphene"]
repository = "https://github.com/filecoin-project/ref-fvm"

[dependencies]
fvm = { version = "4.0.0-alpha.4", path = "../../fvm", default-features = false, features = ["testing", "upgrade-actor"] }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../shared", features = ["testing"] }
fvm = { version = "4.0.0", path = "../../fvm", default-features = false, features = ["testing", "upgrade-actor"] }
fvm_shared = { version = "4.0.0", path = "../../shared", features = ["testing"] }
fvm_ipld_car = { version = "0.7.1", path = "../../ipld/car" }
fvm_ipld_blockstore = { version = "0.2.0", path = "../../ipld/blockstore" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../ipld/encoding" }
Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-address-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }

[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-create-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
actors_v12_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }

[lib]
Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-events-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
serde = {version = "1.0.164", features = ["derive"] }
serde_tuple = "0.5.0"

Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-exit-data-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }

[lib]
Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-gas-calibration-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_gas_calibration_shared = { path = "../../../calibration/shared" }

Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-gaslimit-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
serde = {version = "1.0.164", features = ["derive"] }
serde_tuple = "0.5.0"
log = "0.4.19"
Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-hello-world-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }

[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-integer-overflow-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_ipld_blockstore = { version = "0.2.0", path = "../../../../ipld/blockstore" }

Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-ipld-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }

[target.'cfg(coverage)'.dependencies]
minicov = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-malformed-syscall-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }

[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-oom-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }

[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-readonly-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
cid = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-sself-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
cid = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-stack-overflow-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }

[lib]
crate-type = ["cdylib"] ## cdylib is necessary for Wasm build
4 changes: 2 additions & 2 deletions testing/test_actors/actors/fil-syscall-actor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish = false

[target.'cfg(target_arch = "wasm32")'.dependencies]
fvm_ipld_encoding = { version = "0.4.0", path = "../../../../ipld/encoding" }
fvm_sdk = { version = "4.0.0-alpha.4", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0-alpha.4", path = "../../../../shared" }
fvm_sdk = { version = "4.0.0", path = "../../../../sdk" }
fvm_shared = { version = "4.0.0", path = "../../../../shared" }
minicov = {version = "0.3", optional = true}
actors_v12_runtime = { package = "fil_actors_runtime", git = "https://github.com/filecoin-project/builtin-actors", branch = "master" }
multihash = { workspace = true, features = ["sha3", "sha2", "ripemd"] }
Expand Down

0 comments on commit 836fd4a

Please sign in to comment.