Update

algae/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 name = "algae"
 readme = "README.md"
 repository = "https://github.com/scattered-systems/algae"
-version = "0.1.16" # TODO - Update the cargo package version
+version = "0.1.17" # TODO - Update the cargo package version
 
 [features]
 default = ["core", "graph", "merkle", "mmr"]
@@ -33,17 +33,17 @@ serde_json = "1"
 [dependencies.algae-graph]
 optional = true
 path = "../graph"
-version = "0.1.16"
+version = "0.1.17"
 
 [dependencies.algae-merkle]
 optional = true
 path = "../merkle"
-version = "0.1.16"
+version = "0.1.17"
 
 [dependencies.algae-mmr]
 optional = true
 path = "../mmr"
-version = "0.1.16"
+version = "0.1.17"
 
 
 [package.metadata.docs.rs]

graph/Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0"
 name = "algae-graph"
 readme = "README.md"
 repository = "https://github.com/scattered-systems/algae"
-version = "0.1.16" # TODO - Update the cargo package version
+version = "0.1.17" # TODO - Update the cargo package version
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -19,7 +19,9 @@ crate-type = ["cdylib", "rlib"]
 [dev-dependencies]
 
 [dependencies]
-itertools = "0.10.5"
+decanter = { features = ["derive"], version = "0.1.2" }
 scsys = { features = ["full"], version = "0.1.40" }
+
+itertools = "0.10.5"
 serde = { features = ["derive"], version = "1" }
 serde_json = "1"

merkle/Cargo.toml

@@ -9,21 +9,30 @@ license = "Apache-2.0"
 name = "algae-merkle"
 readme = "README.md"
 repository = "https://github.com/scattered-systems/algae"
-version = "0.1.16" # TODO - Update the cargo package version
+version = "0.1.17" # TODO - Update the cargo package version
 
 [features]
-
+default = [
+    "ring/default"
+]
+wasm = [
+    "decanter/wasm",
+    "ring/wasm32_c"
+]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 test = true
 
 [dependencies]
+decanter = { features = ["derive", "wasm"], version = "0.1.2" }
+# scsys = { features = ["full"], version = "0.1.40" }
+
+anyhow = "1"
 hex = "0.4"
 itertools = "0.10"
 log = "0.4"
-ring = { features = ["wasm32_c"], version = "0.16.20" }
-scsys = { features = ["full"], version = "0.1.40" }
+ring = { features = ["wasm32_c"], version = "0.16" }
 serde = { features = ["derive"], version = "1" }
 serde_json = "1"
 

merkle/src/components/layers/layer.rs → merkle/src/layers.rs

@@ -4,7 +4,7 @@
     Description:
         Merkle Tree def...
 */
-use crate::components::nodes::Node;
+use crate::Node;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::string::ToString;

merkle/src/lib.rs

@@ -6,8 +6,14 @@
 #[cfg(test)]
 extern crate hex_literal;
 #[doc(inline)]
-pub use self::{components::*, core::*, data::*};
+pub use self::{layers::*, nodes::*, payloads::*, primitives::*, shape::*, trees::*, utils::*};
 
-pub(crate) mod components;
-pub(crate) mod core;
-pub(crate) mod data;
+pub(crate) mod layers;
+pub(crate) mod nodes;
+pub(crate) mod payloads;
+pub(crate) mod primitives;
+pub(crate) mod shape;
+pub(crate) mod trees;
+pub(crate) mod utils;
+
+pub mod proofs;

merkle/src/components/nodes/node.rs → merkle/src/nodes.rs

@@ -4,7 +4,7 @@
     Description: ... Summary ...
 */
 use crate::{combine, merkle_hash, Payload};
-use scsys::prelude::{Hashable, H256};
+use decanter::prelude::{Hashable, H256};
 use serde::{Deserialize, Serialize};
 use std::string::ToString;
 

merkle/src/data/proofs/proof.rs → merkle/src/proofs/proof.rs

@@ -5,7 +5,7 @@
 */
 use super::path::proof_path;
 use crate::MerkleDimension;
-use scsys::prelude::H256;
+use decanter::prelude::H256;
 
 // Returns the proof for the given index
 pub fn merkle_proof(dim: MerkleDimension, nodes: Vec<H256>, index: usize) -> Vec<H256> {

merkle/src/components/trees/interface.rs → merkle/src/trees/interface.rs

@@ -4,8 +4,8 @@
     Description:
         Merkle Tree def...
 */
-use crate::components::{layers::Layer, nodes::Node};
-use scsys::prelude::{Hashable, H256};
+use crate::{Layer, Node};
+use decanter::prelude::{Hashable, H256};
 use serde::{Deserialize, Serialize};
 use std::string::ToString;
 

merkle/src/components/trees/mod.rs → merkle/src/trees/mod.rs

@@ -9,7 +9,7 @@ pub(crate) mod interface;
 pub(crate) mod tree;
 
 use crate::{proofs::merkle_proof, MerkleDimension, MerkleShape};
-use scsys::prelude::{Hashable, H256};
+use decanter::prelude::{Hashable, H256};
 
 pub trait MerkleTreeWrapper {
     fn new(dim: MerkleDimension, nodes: Vec<H256>) -> Self;
@@ -45,7 +45,7 @@ pub trait MerkleTreeWrapperExt: MerkleTreeWrapper {
 }
 pub(crate) mod utils {
     use crate::{add_hash, MerkleDimension, MerkleShape};
-    use scsys::prelude::{Hashable, H256};
+    use decanter::prelude::{Hashable, H256};
 
     pub fn create_merkle_tree<T>(data: &[T]) -> (Box<dyn MerkleShape>, Vec<H256>)
     where

merkle/src/components/trees/tree.rs → merkle/src/trees/tree.rs

@@ -7,7 +7,7 @@ use crate::{
     create_merkle_tree, proofs::merkle_proof, MerkleDimension, MerkleShape, MerkleTreeWrapper,
     MerkleTreeWrapperExt,
 };
-use scsys::prelude::{Hashable, H256};
+use decanter::prelude::{Hashable, H256};
 
 #[derive(Debug, Default)]
 pub struct MerkleTree {

merkle/src/core/utils/misc.rs → merkle/src/utils/misc.rs

@@ -3,7 +3,7 @@
     Contrib: FL03 <jo3mccain@icloud.com>
     Description:
 */
-use scsys::prelude::{hasher, H256};
+use decanter::prelude::{hasher, H256};
 use serde::Serialize;
 
 ///

merkle/src/core/utils/mod.rs → merkle/src/utils/mod.rs

@@ -3,8 +3,7 @@
     Contrib: FL03 <jo3mccain@icloud.com>
     Description:
 */
-pub use self::{generate::*, misc::*, validate::*};
+pub use self::{misc::*, validate::*};
 
-pub(crate) mod generate;
 pub(crate) mod misc;
 pub(crate) mod validate;

merkle/src/core/utils/validate.rs → merkle/src/utils/validate.rs

@@ -4,7 +4,7 @@
     Description:
 */
 use crate::{add_hash, proofs::proof_path};
-use scsys::prelude::H256;
+use decanter::prelude::H256;
 
 /// Verify that the datum hash with a vector of proofs will produce the Merkle root. Also need the
 /// index of datum and `leaf_size`, the total number of leaves.