Merge branch 'master' into rpc/update_list_block

starcoinorg · Mar 9, 2021 · 0bccf69 · 0bccf69
2 parents 546b017 + ff69818
commit 0bccf69
Show file tree

Hide file tree

Showing 69 changed files with 544 additions and 281 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account/api/Cargo.toml b/account/api/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 anyhow = "1.0.38"
 thiserror = "1.0"
 async-trait = "0.1"
-serde = { version = "1.0.123", default-features = false }
+serde = { version = "1.0.124", default-features = false }
 serde_bytes = "0.11.5"
 hex= "0.4.3"
 starcoin-types = { path = "../../types"}

diff --git a/account/lib/Cargo.toml b/account/lib/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.3.12"
 async-trait = "0.1"
 rand = "0.8.3"
 parking_lot = "0.11"
-serde = "1.0.123"
+serde = "1.0.124"
 rand_core = { version = "0.6.2", default-features = false }
 starcoin-account-api = {path = "../api",package = "starcoin-account-api"}
 bcs-ext ={package= "bcs-ext", path = "../../commons/bcs_ext" }

diff --git a/chain/api/Cargo.toml b/chain/api/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 anyhow = "1.0.38"
 thiserror = "1.0"
 async-trait = "0.1"
-serde = { version = "1.0.123", default-features = false }
+serde = { version = "1.0.124", default-features = false }
 starcoin-types = { path = "../../types" }
 starcoin-crypto = { path = "../../commons/crypto" }
 rand = "0.8.3"

diff --git a/chain/service/Cargo.toml b/chain/service/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 anyhow = "1.0.38"
 thiserror = "1.0"
 async-trait = "0.1"
-serde = { version = "1.0.123", default-features = false }
+serde = { version = "1.0.124", default-features = false }
 starcoin-types = { path = "../../types" }
 starcoin-crypto = { path = "../../commons/crypto" }
 rand = "0.8.3"

diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.38"
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 futures = "0.3.12"
 hex = { version = "0.4.3", default-features = false }

diff --git a/cmd/generator/src/lib.rs b/cmd/generator/src/lib.rs
@@ -28,7 +28,7 @@ pub fn init_or_load_data_dir(
         bail!("Please set data_dir option.")
     }
     let storage = Arc::new(Storage::new(StorageInstance::new_cache_and_db_instance(
-        CacheStorage::new(),
+        CacheStorage::new_with_capacity(config.storage.cache_size()),
         DBStorage::new(config.storage.dir(), config.storage.rocksdb_config())?,
     ))?);
     let (chain_info, _genesis) =

diff --git a/cmd/indexer/Cargo.toml b/cmd/indexer/Cargo.toml
@@ -13,7 +13,7 @@ anyhow = "~1"
 async-trait = "~0.1"
 clap = "3.0.0-beta.2"
 elasticsearch = "7.11.0-alpha.1"
-serde = "1.0.123"
+serde = "1.0.124"
 serde_json = "~1"
 starcoin-crypto = {path = "../../commons/crypto" }
 starcoin-types = {path= "../../types" }

diff --git a/cmd/miner_client/Cargo.toml b/cmd/miner_client/Cargo.toml
@@ -21,7 +21,7 @@ crypto = { package = "starcoin-crypto", path = "../../commons/crypto" }
 jsonrpc-core = { version = "17.0.0", features = ["arbitrary_precision"] }
 jsonrpc-tcp-server = "17.0.0"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 rust-argon2 = "0.8"
 rand = "0.8.3"
 rand_core = { version = "0.6.2", default-features = false }

diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 rand = "0.8.3"
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 serde_json = { version="1.0", features = ["arbitrary_precision"]}
 crossbeam-channel = "0.5.0"
 tokio = { version = "0.2", features = ["full"] }
@@ -44,10 +44,10 @@ starcoin-genesis = { path = "../../core/genesis" }
 starcoin-resource-viewer = { path = "../../vm/resource-viewer" }
 starcoin-service-registry = { path = "../../commons/service-registry" }
 starcoin-move-explain = { path = "../../vm/move-explain" }
-errmapgen = { git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+errmapgen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 network-api = {path = "../../network/api", package="network-api"}
 starcoin-network-rpc-api = {path = "../../network-rpc/api"}
-short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 
 
 [dev-dependencies]

diff --git a/commons/bcs_ext/Cargo.toml b/commons/bcs_ext/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.38"
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 bcs = "0.1.2"
diff --git a/commons/crypto/Cargo.toml b/commons/crypto/Cargo.toml
@@ -7,12 +7,12 @@ publish = false
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 serde_bytes = "0.11.5"
 hex = "0.4.3"
 anyhow = "1.0"
-diem-crypto = { package="diem-crypto",  git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710", features = ["fuzzing"] }
-diem-crypto-derive = { package="diem-crypto-derive",  git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+diem-crypto = { package="diem-crypto",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686", features = ["fuzzing"] }
+diem-crypto-derive = { package="diem-crypto-derive",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 bcs-ext = { package="bcs-ext", path = "../bcs_ext" }
 crypto-macro = { package="starcoin-crypto-macro", path = "./crypto-macro"}
 rand = "0.8.3"

diff --git a/commons/logger/Cargo.toml b/commons/logger/Cargo.toml
@@ -12,5 +12,5 @@ log = "0.4.14"
 chrono = "0.4.19"
 log4rs = { version="1.0.0", features = ["background_rotation", "gzip"]}
 once_cell = "1.7.2"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 parking_lot = "0.11.1"
diff --git a/commons/proptest-helpers/Cargo.toml b/commons/proptest-helpers/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 crossbeam = "0.7.3"
-diem-proptest-helpers = { package="diem-proptest-helpers",  git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+diem-proptest-helpers = { package="diem-proptest-helpers",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
diff --git a/commons/scmd/Cargo.toml b/commons/scmd/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 thiserror = "1.0"
-serde = { version = "1.0.123", features = ["derive"] }
-rustyline = "7.1.0"
+serde = { version = "1.0.124", features = ["derive"] }
+rustyline = "8.0.0"
 structopt = "0.3.21"
 clap = "2.33.3"
 serde_json = { version="1.0", features = ["arbitrary_precision"]}

diff --git a/commons/serde-helpers/Cargo.toml b/commons/serde-helpers/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_bytes = {version = "0.11"}
 hex = {version = "0.4"}
 

diff --git a/commons/service-registry/Cargo.toml b/commons/service-registry/Cargo.toml
@@ -16,7 +16,7 @@ actix = "0.10.0"
 actix-rt = "1.1"
 futures = "0.3.12"
 futures-timer = "3.0"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 once_cell = "1.7.2"
 log = "0.4.14"
 

diff --git a/commons/stream-task/Cargo.toml b/commons/stream-task/Cargo.toml
@@ -15,7 +15,7 @@ futures-timer = "3.0"
 futures-retry = "0.5.0"
 pin-project = "0.4.8"
 log = "0.4.14"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 parking_lot = "0.11.1"
 
 [dev-dependencies]

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -11,7 +11,7 @@ clap = "2.33.3"
 dirs-next = "2.0.0"
 anyhow = "1.0.38"
 thiserror = "1.0"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 toml = { version = "0.5.8", default-features = false }
 structopt = "0.3.21"
@@ -29,6 +29,6 @@ starcoin-types = { path = "../types" }
 starcoin-vm-types = { path = "../vm/types" }
 network-p2p-types = { path = "../network-p2p/types"}
 starcoin-logger = {path = "../commons/logger", package="starcoin-logger"}
-diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 starcoin-system = {path = "../commons/system", package="starcoin-system"}
 network-api = {path = "../network/api", package="network-api"}
diff --git a/config/src/lib.rs b/config/src/lib.rs
@@ -61,7 +61,7 @@ pub use starcoin_vm_types::genesis_config::{
     StdlibVersion, DEV_CONFIG, HALLEY_CONFIG, MAIN_CONFIG, PROXIMA_CONFIG,
 };
 pub use starcoin_vm_types::time::{MockTimeService, RealTimeService, TimeService};
-pub use storage_config::{RocksdbConfig, StorageConfig};
+pub use storage_config::{RocksdbConfig, StorageConfig, DEFAULT_CACHE_SIZE};
 pub use txpool_config::TxPoolConfig;
 
 pub static CRATE_VERSION: &str = crate_version!();

diff --git a/config/src/storage_config.rs b/config/src/storage_config.rs
@@ -56,6 +56,7 @@ impl Default for RocksdbConfig {
 }
 
 static DEFAULT_DB_DIR: Lazy<PathBuf> = Lazy::new(|| PathBuf::from("starcoindb/db"));
+pub const DEFAULT_CACHE_SIZE: usize = 20000;
 
 #[derive(Clone, Default, Debug, Deserialize, PartialEq, Serialize, StructOpt)]
 #[serde(deny_unknown_fields)]
@@ -72,6 +73,10 @@ pub struct StorageConfig {
     )]
     pub max_total_wal_size: Option<u64>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[structopt(name = "cache-sizes", long, help = "cache sizes")]
+    pub cache_size: Option<usize>,
+
     #[serde(skip)]
     #[structopt(skip)]
     base: Option<Arc<BaseConfig>>,
@@ -95,6 +100,9 @@ impl StorageConfig {
                 .unwrap_or(default.max_total_wal_size),
         }
     }
+    pub fn cache_size(&self) -> usize {
+        self.cache_size.unwrap_or(DEFAULT_CACHE_SIZE)
+    }
 }
 
 impl ConfigModule for StorageConfig {
@@ -106,6 +114,9 @@ impl ConfigModule for StorageConfig {
         if opt.storage.max_total_wal_size.is_some() {
             self.max_total_wal_size = opt.storage.max_total_wal_size;
         }
+        if opt.storage.cache_size.is_some() {
+            self.cache_size = opt.storage.cache_size;
+        }
         Ok(())
     }
 }
diff --git a/core/accumulator/Cargo.toml b/core/accumulator/Cargo.toml
@@ -16,7 +16,7 @@ itertools = { version = "0.10.0", default-features = false }
 logger = {path = "../../commons/logger", package="starcoin-logger"}
 starcoin-crypto = { package="starcoin-crypto", path = "../../commons/crypto"}
 bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 lru = "0.6.5"
 parking_lot = "0.11.1"
 

diff --git a/core/forkable-jellyfish-merkle/Cargo.toml b/core/forkable-jellyfish-merkle/Cargo.toml
@@ -16,15 +16,15 @@ num-derive = "0.3.3"
 num-traits = "0.2"
 proptest = { version = "1.0.0", optional = true }
 proptest-derive = { version = "0.3.0", optional = true }
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_bytes = {version = "0.11"}
 starcoin-crypto = { path = "../../commons/crypto"}
 thiserror = "1.0"
 tiny-keccak = "1.5"
 hex= "0.4.3"
 once_cell = "1.7.2"
 bcs-ext = { path = "../../commons/bcs_ext", package = "bcs-ext" }
-short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
 
 [dev-dependencies]
 rand = "0.8.3"

diff --git a/core/genesis/Cargo.toml b/core/genesis/Cargo.toml
@@ -15,7 +15,7 @@ once_cell = "1.7.2"
 include_dir = "0.6.0"
 starcoin-types = {path = "../../types", features = ["fuzzing"]}
 starcoin-crypto = { path = "../../commons/crypto"}
-serde = { version = "1.0.123" }
+serde = { version = "1.0.124" }
 starcoin-config = { path = "../../config"}
 starcoin-executor = { path = "../../executor"}
 starcoin-storage = { path = "../../storage"}

diff --git a/dataformat-generator/Cargo.toml b/dataformat-generator/Cargo.toml
@@ -19,6 +19,6 @@ starcoin-types = { path = "../types" }
 starcoin-crypto = {path = "../commons/crypto" }
 #starcoin-rpc-api = {path = "../rpc/api" }
 anyhow = "1.0"
-serde = "1.0.123"
+serde = "1.0.124"
 serde_yaml = "0.8"
 bcs-ext = { package="bcs-ext", path = "../commons/bcs_ext" }
diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 determinator = "0.3.0"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.61"
 structopt = "0.3.21"
 anyhow = "1.0.38"
@@ -22,8 +22,8 @@ chrono = "0.4.19"
 globset = "0.4.6"
 regex = "1.4.3"
 rayon = "1.5.0"
-indexmap = "1.6.1"
-x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
-x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
-diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
-diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="08f668c46ed873eb8c30cd9aa46f7d0737872710" }
+indexmap = "1.6.2"
+x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
diff --git a/network-p2p/Cargo.toml b/network-p2p/Cargo.toml
@@ -29,7 +29,7 @@ lru = "0.6.5"
 parking_lot = "0.11.1"
 rand = "0.8.3"
 pin-project = "0.4.27"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = { version="1.0", features = ["arbitrary_precision"]}
 smallvec = "1.6.0"
 thiserror = "1"

diff --git a/network-p2p/types/Cargo.toml b/network-p2p/types/Cargo.toml
@@ -13,7 +13,7 @@ bytes = "0.5.0"
 derive_more = "0.99.11"
 rand = "0.8.3"
 bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = { version="1.0", features = ["arbitrary_precision"]}
 libp2p = { version = "0.35.1", default-features = false, features = ["request-response"] }
 sc-peerset = { path = "../peerset"}

diff --git a/network-rpc/Cargo.toml b/network-rpc/Cargo.toml
@@ -11,7 +11,7 @@ anyhow = "1.0.38"
 futures = "0.3.12"
 hex = "0.4.3"
 bytes = "0.5.0"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.59"
 parity-codec = { version = "3.2", features = ["derive"] }
 tokio = { version = "0.2", features = ["full"] }

diff --git a/network-rpc/api/Cargo.toml b/network-rpc/api/Cargo.toml
@@ -20,6 +20,6 @@ starcoin-state-tree = { path = "../../state/state-tree" }
 network-rpc-derive = { path = "../derive" }
 bcs-ext = { path = "../../commons/bcs_ext", package = "bcs-ext" }
 starcoin-logger = {path = "../../commons/logger"}
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 anyhow = "1.0.38"
 futures = "0.3.12"
diff --git a/network-rpc/core/Cargo.toml b/network-rpc/core/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 futures = "0.3.12"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 log = "0.4.14"
 network-rpc-derive = { path = "../derive" }
 num_enum = "0.5.1"

diff --git a/network-rpc/derive/Cargo.toml b/network-rpc/derive/Cargo.toml
@@ -13,11 +13,11 @@ proc-macro = true
 syn = { version = "1.0", features = ["full", "extra-traits", "visit", "fold"] }
 proc-macro2 = "1.0"
 quote = "1.0.9"
-proc-macro-crate = "0.1.4"
+proc-macro-crate = "1.0.0"
 
 futures = "0.3.12"
 anyhow = "1.0.38"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 
 starcoin-types = {path = "../../types"}
 starcoin-logger = {path = "../../commons/logger"}
diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -35,12 +35,12 @@ rand = "0.8.3"
 parking_lot = "0.11.1"
 lru = "0.6.5"
 
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 serde_json = { version="1.0", features = ["arbitrary_precision"]}
 slog = { version = "2.5.2", features = ["nested-values"] }
 slog_derive = "0.2.0"
 derive_more = "0.99.11"
-async-trait = "0.1.42"
+async-trait = "0.1.47"
 stest = { path = "../commons/stest" }
 async-std = "1.9"
 

diff --git a/network/api/Cargo.toml b/network/api/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 hex= "0.4.3"
 anyhow = "1.0.38"
 futures = "0.3.12"
-serde = { version = "1.0.123", default-features = false }
+serde = { version = "1.0.124", default-features = false }
 rand = "0.8.3"
 itertools = "0.10.0"
-async-trait = "0.1.42"
+async-trait = "0.1.47"
 rand_distr = "0.4.0"
 parking_lot = "0.11.1"
 

diff --git a/node/api/Cargo.toml b/node/api/Cargo.toml
@@ -12,7 +12,7 @@ thiserror = "1.0"
 backtrace = "0.3.55"
 futures = "0.3.12"
 async-trait = "0.1"
-serde = { version = "1.0.123", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 starcoin-config = { path = "../../config" }
 starcoin-consensus = { path = "../../consensus" }
 starcoin-storage = { path = "../../storage" }