diff --git a/CHANGELOG.md b/CHANGELOG.md index dc3281dc..3a7bb5d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Version 0.34.0 (2022-12-26) + +[PR 414](https://github.com/fluencelabs/aquavm/pull/414): +Remove the `InterpreterOutcome::cid` as it is not really neaded, +but makes integration more difficult. + ## Version 0.33.0 (2022-12-21) [PR 401](https://github.com/fluencelabs/aquavm/pull/401): diff --git a/Cargo.lock b/Cargo.lock index 44863684..9c62dc61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,7 +13,7 @@ dependencies = [ [[package]] name = "air" -version = "0.33.0" +version = "0.34.0" dependencies = [ "air-execution-info-collector", "air-interpreter-cid", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "air-interpreter" -version = "0.33.0" +version = "0.34.0" dependencies = [ "air", "air-interpreter-interface", @@ -126,9 +126,8 @@ dependencies = [ [[package]] name = "air-interpreter-interface" -version = "0.12.0" +version = "0.12.1" dependencies = [ - "air-interpreter-cid", "fluence-it-types", "marine-rs-sdk", "serde", @@ -338,7 +337,7 @@ dependencies = [ [[package]] name = "avm-interface" -version = "0.28.0" +version = "0.28.1" dependencies = [ "air-interpreter-interface", "air-utils", @@ -354,7 +353,7 @@ dependencies = [ [[package]] name = "avm-server" -version = "0.28.0" +version = "0.28.1" dependencies = [ "air-interpreter-interface", "air-utils", diff --git a/air-interpreter/Cargo.toml b/air-interpreter/Cargo.toml index 02b9abc0..3bc6a09a 100644 --- a/air-interpreter/Cargo.toml +++ b/air-interpreter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "air-interpreter" -version = "0.33.0" +version = "0.34.0" description = "Crate-wrapper for air" authors = ["Fluence Labs"] edition = "2018" diff --git a/air/Cargo.toml b/air/Cargo.toml index 9cc60549..f2ea6695 100644 --- a/air/Cargo.toml +++ b/air/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "air" -version = "0.33.0" +version = "0.34.0" description = "Interpreter of AIR scripts intended to coordinate request flow in the Fluence network" authors = ["Fluence Labs"] edition = "2018" diff --git a/avm/interface/CHANGELOG.md b/avm/interface/CHANGELOG.md index 34ab6e3b..3d908a3e 100644 --- a/avm/interface/CHANGELOG.md +++ b/avm/interface/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.1] - 2022-12-26 + +### Changed + +- Bump version of `avm-interpreter-interface` to 0.12.1: + it has removed a new `cid` field in the `InterpreterOutcome`. + ## [0.28.0] - 2022-12-21 ### Changed diff --git a/avm/interface/Cargo.toml b/avm/interface/Cargo.toml index 064de098..3e577838 100644 --- a/avm/interface/Cargo.toml +++ b/avm/interface/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm-interface" description = "Fluence AIR VM interfacing" -version = "0.28.0" +version = "0.28.1" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -15,7 +15,7 @@ name = "avm_interface" path = "src/lib.rs" [dependencies] -air-interpreter-interface = { version = "0.12.0", path = "../../crates/air-lib/interpreter-interface", default-features = false } +air-interpreter-interface = { version = "0.12.1", path = "../../crates/air-lib/interpreter-interface", default-features = false } air-utils = { version = "0.1.0", path = "../../crates/air-lib/utils" } avm-data-store = { version = "0.4.1", path = "../../crates/data-store" } polyplets = { version = "0.3.2", path = "../../crates/air-lib/polyplets" } diff --git a/avm/interface/src/raw_outcome.rs b/avm/interface/src/raw_outcome.rs index d47d25ef..2377dfc1 100644 --- a/avm/interface/src/raw_outcome.rs +++ b/avm/interface/src/raw_outcome.rs @@ -41,7 +41,6 @@ impl RawAVMOutcome { data, call_requests, next_peer_pks, - cid: _, } = outcome; let call_requests = crate::from_raw_call_requests(call_requests)?; diff --git a/avm/server/CHANGELOG.md b/avm/server/CHANGELOG.md index f52e5b51..9b267ce4 100644 --- a/avm/server/CHANGELOG.md +++ b/avm/server/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.28.1] - 2022-12-26 + ++ Update `avm-interface` version after `air-interpreter-interface` version bump. + ## [0.28.0] - 2022-12-21 + Update `avm-interface` version after `air-interpreter-interface` version bump. diff --git a/avm/server/Cargo.toml b/avm/server/Cargo.toml index b17c1c82..95240b38 100644 --- a/avm/server/Cargo.toml +++ b/avm/server/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "avm-server" description = "Fluence AIR VM" -version = "0.28.0" +version = "0.28.1" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -15,7 +15,7 @@ name = "avm_server" path = "src/lib.rs" [dependencies] -air-interpreter-interface = { version = "0.12.0", path = "../../crates/air-lib/interpreter-interface" } +air-interpreter-interface = { version = "0.12.1", path = "../../crates/air-lib/interpreter-interface" } air-utils = { version = "0.1.0", path = "../../crates/air-lib/utils" } avm-data-store = { version = "0.4.1", path = "../../crates/data-store" } marine-runtime = "0.24.0" diff --git a/crates/air-lib/interpreter-interface/CHANGELOG.md b/crates/air-lib/interpreter-interface/CHANGELOG.md index 0e5ecc64..0b5bb7b1 100644 --- a/crates/air-lib/interpreter-interface/CHANGELOG.md +++ b/crates/air-lib/interpreter-interface/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.12.1] - 2022-12-26 + ++ Remove the new `cid` field of the `InterpreterOutcome` as it is not really needed. + ## [0.12.0] - 2022-12-21 + New `cid` field of the `InterpreterOutcome` contains CID of the data. diff --git a/crates/air-lib/interpreter-interface/Cargo.toml b/crates/air-lib/interpreter-interface/Cargo.toml index 9222e08a..57a4672a 100644 --- a/crates/air-lib/interpreter-interface/Cargo.toml +++ b/crates/air-lib/interpreter-interface/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "air-interpreter-interface" description = "Interface of the AIR interpreter" -version = "0.12.0" +version = "0.12.1" authors = ["Fluence Labs"] edition = "2018" license = "Apache-2.0" @@ -15,7 +15,6 @@ name = "air_interpreter_interface" path = "src/lib.rs" [dependencies] -air-interpreter-cid = { version = "0.1.0", path = "../interpreter-cid" } marine-rs-sdk = { version = "0.7.1", optional = true } fluence-it-types = { version = "0.3.2", optional = true } diff --git a/crates/air-lib/interpreter-interface/src/interpreter_outcome.rs b/crates/air-lib/interpreter-interface/src/interpreter_outcome.rs index 90850f00..82e6698e 100644 --- a/crates/air-lib/interpreter-interface/src/interpreter_outcome.rs +++ b/crates/air-lib/interpreter-interface/src/interpreter_outcome.rs @@ -43,9 +43,6 @@ pub struct InterpreterOutcome { /// Collected parameters of all met call instructions that could be executed on a current peer. pub call_requests: Vec, - - /// IPLD CID of the data field. - pub cid: String, } impl InterpreterOutcome { @@ -56,15 +53,12 @@ impl InterpreterOutcome { next_peer_pks: Vec, call_requests: Vec, ) -> Self { - let cid = air_interpreter_cid::json_data_cid(&data).into(); - Self { ret_code, error_message, data, next_peer_pks, call_requests, - cid, } } }