Merge f5ee852 into 6d5f91c

Cargo.toml

@@ -16,12 +16,11 @@ members = [
     "commons/serde-helpers",
     "commons/stream-task",
     "commons/api-limiter",
+    "commons/accumulator",
+    "commons/forkable-jellyfish-merkle",
     "types",
     "types/uint",
-    "core/traits",
-    "core/accumulator",
-    "core/forkable-jellyfish-merkle",
-    "core/genesis",
+    "genesis",
     "state/api",
     "state/state-tree",
     "state/statedb",
@@ -61,7 +60,7 @@ members = [
     "network-rpc/core",
     "network-rpc/api",
     "account/api",
-    "account/lib",
+    "account",
     "account/service",
     "rpc/api",
     "rpc/middleware",
@@ -106,12 +105,11 @@ default-members = [
     "commons/serde-helpers",
     "commons/stream-task",
     "commons/api-limiter",
+    "commons/accumulator",
+    "commons/forkable-jellyfish-merkle",
     "types",
     "types/uint",
-    "core/traits",
-    "core/accumulator",
-    "core/forkable-jellyfish-merkle",
-    "core/genesis",
+    "genesis",
     "state/api",
     "state/state-tree",
     "state/statedb",
@@ -151,7 +149,7 @@ default-members = [
     "network-rpc/core",
     "network-rpc/api",
     "account/api",
-    "account/lib",
+    "account",
     "account/service",
     "rpc/api",
     "rpc/middleware",

account/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "starcoin-account"
+version = "1.0.0-alpha.1"
+authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+license = "Apache-2.0"
+publish = false
+edition = "2018"
+
+[dependencies]
+anyhow = "1.0.39"
+futures = "0.3.12"
+async-trait = "0.1"
+rand = "0.8.3"
+parking_lot = "0.11"
+serde = "1.0.125"
+rand_core = { version = "0.6.2", default-features = false }
+starcoin-account-api = {path = "./api"}
+bcs-ext ={package= "bcs-ext", path = "../commons/bcs_ext" }
+starcoin-types = { path = "../types"}
+starcoin-config = { path = "../config"}
+starcoin-crypto = { path = "../commons/crypto"}
+starcoin-decrypt = {path = "../commons/decrypt"}
+starcoin-storage = {path = "../storage"}
+starcoin-logger = {path = "../commons/logger"}
+
+[dev-dependencies]
+hex= "0.4.3"
+tempfile="3"

account/service/Cargo.toml

@@ -16,14 +16,12 @@ bcs-ext = { package = "bcs-ext", path = "../../commons/bcs_ext" }
 starcoin-config = { path = "../../config" }
 starcoin-service-registry = { path = "../../commons/service-registry" }
 starcoin-account-api = { path = "../api", features = ["mock"] }
-starcoin-account-lib = { path = "../lib" }
+starcoin-account = { path = "../" }
 starcoin-crypto = { path = "../../commons/crypto" }
 starcoin-chain-notify = { path = "../../chain/chain-notify" }
 
 
 [dev-dependencies]
 stest = { path = "../../commons/stest" }
-starcoin-types = { path = "../../types" }
 tempfile = "3"
-tokio = { version = "0.2", features = ["full"] }
 

account/service/src/account_events.rs

@@ -1,5 +1,5 @@
 use anyhow::{Error, Result};
-use starcoin_account_lib::account_storage::AccountStorage;
+use starcoin_account::account_storage::AccountStorage;
 use starcoin_chain_notify::message::ContractEventNotification;
 use starcoin_logger::prelude::*;
 use starcoin_service_registry::{ActorService, EventHandler, ServiceContext, ServiceFactory};

account/service/src/lib.rs

@@ -6,4 +6,4 @@ mod service;
 
 pub use account_events::AccountEventService;
 pub use service::AccountService;
-pub use starcoin_account_lib::account_storage::AccountStorage;
+pub use starcoin_account::account_storage::AccountStorage;