update config.

.changes/config.json

@@ -71,23 +71,19 @@
     }
   },
   "packages": {
-    "utils-derive": {
-      "path": "./utils/utils-derive/",
+    "stronghold-derive": {
+      "path": "./derive/",
       "manager": "rust"
     },
     "stronghold-runtime": {
       "path": "./engine/runtime/",
       "manager": "rust"
     },
-    "communication-macros": {
-      "path": "./communication/communication-macros",
-      "manager": "rust"
-    },
     "stronghold-utils": {
       "path": "./utils/utils/",
       "manager": "rust",
       "dependencies": [
-        "utils-derive"
+        "stronghold-derive"
       ]
     },
     "stronghold-engine": {
@@ -101,8 +97,7 @@
       "path": "./communication/",
       "manager": "rust",
       "dependencies": [
-        "stronghold-utils",
-        "communication-macros"
+        "stronghold-utils"
       ]
     },
     "iota-stronghold": {
@@ -112,7 +107,7 @@
         "stronghold-engine",
         "stronghold-communication",
         "stronghold-utils",
-        "runtime"
+        "stronghold-runtime"
       ]
     },
     "commandline": {

.changes/restructure.md

@@ -0,0 +1,9 @@
+---
+"stronghold-engine": minor
+"stronghold-utils": minor
+"stronghold-derive": minor
+---
+
+Merged Store, Vault and Snapshot into a single crate called Stronghold-Engine. 
+Merged utils-derive and communication-macros into a new crate called stronghold-derive
+Export Stronghold-derive through Stronghold-utils. 

.github/workflows/clippy.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        project: [engine, client, products/commandline, utils/utils, utils/utils-derive]
+        project: [engine, client, products/commandline, derive, utils, communication]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/format.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        project: [engine, client, communication, products/commandline, utils/utils, utils/utils-derive]
+        project: [engine, client, products/commandline, derive, utils, communication]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        project: [engine, client, communication, products/commandline, utils/utils]
+        project: [engine, client, products/commandline, derive, utils, communication]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:

communication/Cargo.toml

@@ -32,7 +32,6 @@ thiserror = "1.0"
 serde = { version = "1.0", default-features = false, features = [ "alloc", "derive" ] }
 serde_json = { version = "1.0", default-features = false, features = [ "alloc" ] }
 riker = "0.4"
-stronghold-derive = { path = "../derive", version = "0.1.0" }
 
 [dependencies.stronghold-utils]
 path = "../utils"

communication/src/actor.rs

@@ -10,7 +10,7 @@
 //! Before forwarding any requests, the request will be validated by the firewall according to the configuration from
 //! [`CommunicationConfig`], additional rules or changed can be set with [`CommunicationRequest::ConfigureFirewall`].
 //! This requires that the [`ToPermissionVariants`] trait is implemented for the generic `Req` type, which can be
-//! derived with the macro [`RequestPermissions`] from [`communication_macros`].
+//! derived with the macro [`RequestPermissions`] from [`stronghold_utils`].
 //!
 //! If remote peers should be able to dial the local system, a [`CommunicationRequest::StartListening`] has to be sent
 //! to the [`CommunicationActor`].
@@ -23,7 +23,7 @@
 //!     },
 //!     behaviour::BehaviourConfig,
 //! };
-//! use communication_macros::RequestPermissions;
+//! use stronghold_utils::RequestPermissions;
 //! use libp2p::identity::Keypair;
 //! use riker::actors::*;
 //! use serde::{Deserialize, Serialize};

communication/src/actor/firewall.rs

@@ -3,7 +3,7 @@
 
 use libp2p::PeerId;
 use std::collections::HashMap;
-pub use stronghold_derive::RequestPermissions;
+pub use stronghold_utils::RequestPermissions;
 
 /// The permission value for request variants.
 /// It is a  bit that is set at a certain index, therefore the value is always a power of 2.

derive/CHANGELOG.md

@@ -6,5 +6,14 @@
   rebuild vault and remove versioning.
   update client to use new vault.
   - [5490f0a](https://www.github.com/iotaledger/stronghold.rs/commit/5490f0aaaf58e5322a5569c02669514ec067b02f) refactor vault ([#181](https://www.github.com/iotaledger/stronghold.rs/pull/181)) on 2021-04-15
-
-## \[0.1.0]
+- Updated cargo.toml files with the updated crypto.rs revisions and authors.
+  Fixed logic in snapshot and providers to use the `try_*` encryption and decryption functions.
+  Fixed commandline and stopped it from overwriting snapshots.
+  - [64e08fe](https://www.github.com/iotaledger/stronghold.rs/commit/64e08fe39454d2191561783d009b155c91db37c1) add .changes. on 2021-03-19
+  - [0758b67](https://www.github.com/iotaledger/stronghold.rs/commit/0758b6734a1e22d491345a6b894acea12ab5b1b7) add .changes. on 2021-03-19
+- Patch libp2p v0.35 -> v0.36, handle Mdns and dns transport changes, and make P2PNetworkBehaviour init_swarm method async.
+  Move communication macro test to stronghold-communication.
+  - [7e3c024](https://www.github.com/iotaledger/stronghold.rs/commit/7e3c02412b4d8657e62bc0b14862443d2f1f1f63) patch(comms): libp2p v0.36 ([#180](https://www.github.com/iotaledger/stronghold.rs/pull/180)) on 2021-03-24
+- Patch libp2p v0.36 -> v0.37, handle changes in Identify protocol and the removed Dereferencing from Swarm to NetworkBehaviour.
+  Remove unnecessary fields in the pattern matching of the `RequestPermissions` macro.
+  - [7e9d267](https://www.github.com/iotaledger/stronghold.rs/commit/7e9d267b873563656d8004416678ef0891f239ad) Update libp2p requirement from 0.36 to 0.37 in /communication ([#185](https://www.github.com/iotaledger/stronghold.rs/pull/185)) on 2021-04-15

derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stronghold-derive"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   "IOTA Stiftung",
   "tensor-programming <tensordeveloper@gmail.com>"

engine/CHANGELOG.md

@@ -8,7 +8,14 @@
   - Bumped due to a bump in snapshot.
   - [64e08fe](https://www.github.com/iotaledger/stronghold.rs/commit/64e08fe39454d2191561783d009b155c91db37c1) add .changes. on 2021-03-19
   - [0758b67](https://www.github.com/iotaledger/stronghold.rs/commit/0758b6734a1e22d491345a6b894acea12ab5b1b7) add .changes. on 2021-03-19
-
+- Remove old logic from client and vault.
+  Added clear cache logic and message to stop the client actor.
+  Removed Client Derive Data hashmap.
+  - [81892aa](https://www.github.com/iotaledger/stronghold.rs/commit/81892aa704b920c50de2517e8073943d8bf0c2b9) add md file. on 2021-04-20
+- move stronghold-utils and add utils-derive for proc macros.
+  rebuild vault and remove versioning.
+  update client to use new vault.
+  - [5490f0a](https://www.github.com/iotaledger/stronghold.rs/commit/5490f0aaaf58e5322a5569c02669514ec067b02f) refactor vault ([#181](https://www.github.com/iotaledger/stronghold.rs/pull/181)) on 2021-04-15
 ## \[0.3.0]
 
 - Added zeroing allocator to the runtime.\
@@ -33,6 +40,18 @@
 - Remove Crypto, Random and Primitives libraries in favor of Crypto.rs
   Moved Runtime into the engine.
   Add new guarded types for Runtime and remove old logic.
+- Add documentation and cleanup the code for these crates and modules in preparation for beta.
+  - [dae0457](https://www.github.com/iotaledger/stronghold.rs/commit/dae04579cb20ad69a7aecdf102fb66ecac4aaf46) Beta Cleanup ([#166](https://www.github.com/iotaledger/stronghold.rs/pull/166)) on 2021-03-19
+- Create key:value store for insecure data storage and retrieval.
+  - [0ba3398](https://www.github.com/iotaledger/stronghold.rs/commit/0ba3398987dcbb168e210bc4b2b6e295e5a020c6) chore(covector): add store config & changelog on 2021-01-05
+- Blake2b hashing revision to use new upstream digest approach.
+  - [04cc457](https://www.github.com/iotaledger/stronghold.rs/commit/04cc457497fc594a4453c86e23c999731efcb174) fix(snapshot): blake2b ([#153](https://www.github.com/iotaledger/stronghold.rs/pull/153)) on 2021-02-25
+- Change the snapshot format to use an ephemeral X25519 private key and a key
+  exchange with the users snapshot key to generate the key used in the XChaCha20
+  cipher. This in order to mitigate offline attacks in the scenario that the
+  cipher is compromised in such a way to reveal the key.
+  - [6fca456](https://www.github.com/iotaledger/stronghold.rs/commit/6fca456a80993a99f38949f1cd3137a4a265a2e6) Use X25519 in the snapshot format ([#123](https://www.github.com/iotaledger/stronghold.rs/pull/123)) on 2021-02-08
+
 
 ## Features:
 
@@ -59,3 +78,11 @@ Clean up logic inside of the Client library.
 - Alpha release of Stronghold: "Saint-Malo"
   - [4b6f4af](https://www.github.com/iotaledger/stronghold.rs/commit/4b6f4af29f6c21044f5063ec4a8d8aff643f81a7) chore(release) ([#105](https://www.github.com/iotaledger/stronghold.rs/pull/105)) on 2020-12-24
   - [06c6d51](https://www.github.com/iotaledger/stronghold.rs/commit/06c6d513dfcd1ba8ed6379177790ec6db28a6fea) fix(changelog): Alpha Release ([#106](https://www.github.com/iotaledger/stronghold.rs/pull/106)) on 2020-12-24
+- Added the initial client logic and integrated it with the Riker actor model. Change includes a Client/Cache actor, a Bucket actor, a Snapshot actor, and a keystore actor.  All of the Stronghold APIs are available.
+  - [7c7320a](https://www.github.com/iotaledger/stronghold.rs/commit/7c7320ab0bc71749510a590f418c9bd70329dc02) add client changelog. on 2020-11-30
+  - [4986685](https://www.github.com/iotaledger/stronghold.rs/commit/49866854f32dde8589f37c6d9ea0c2e7ddb3c461) remove todos and update readme. on 2020-11-30
+  - [7f1e9ed](https://www.github.com/iotaledger/stronghold.rs/commit/7f1e9edf5f5c5e148376575057a55d1d1398708a) Chore/covector fix ([#61](https://www.github.com/iotaledger/stronghold.rs/pull/61)) on 2020-12-01
+  - [f882754](https://www.github.com/iotaledger/stronghold.rs/commit/f88275451e7d3c140bbfd1c90a9267aa222fb6d0) fix(client): readme and changelog ([#64](https://www.github.com/iotaledger/stronghold.rs/pull/64)) on 2020-12-01
+- Alpha release of Stronghold: "Saint-Malo"
+  - [4b6f4af](https://www.github.com/iotaledger/stronghold.rs/commit/4b6f4af29f6c21044f5063ec4a8d8aff643f81a7) chore(release) ([#105](https://www.github.com/iotaledger/stronghold.rs/pull/105)) on 2020-12-24
+  - [06c6d51](https://www.github.com/iotaledger/stronghold.rs/commit/06c6d513dfcd1ba8ed6379177790ec6db28a6fea) fix(changelog): Alpha Release ([#106](https://www.github.com/iotaledger/stronghold.rs/pull/106)) on 2020-12-24

engine/benches/benchmark.rs

@@ -114,6 +114,7 @@ criterion_group!(
     bench_snapshot_decompress,
     bench_store_compress,
     bench_store_compression,
-    bench_store_decompress
+    bench_store_decompress,
+    bench_vault_write
 );
 criterion_main!(benches);

utils/Cargo.toml

@@ -15,4 +15,4 @@ riker = "0.4"
 
 [dependencies.stronghold-derive]
 path = "../derive"
-version = "0.1.0"
+version = "0.1.1"

utils/src/lib.rs

@@ -4,4 +4,4 @@
 mod ask;
 pub mod test_utils;
 pub use ask::ask;
-pub use stronghold_derive::GuardDebug;
+pub use stronghold_derive::{GuardDebug, RequestPermissions};