diff --git a/src/components/abciapp/src/abci/server/callback/mod.rs b/src/components/abciapp/src/abci/server/callback/mod.rs index 38ef77556..35306ab8e 100644 --- a/src/components/abciapp/src/abci/server/callback/mod.rs +++ b/src/components/abciapp/src/abci/server/callback/mod.rs @@ -2,6 +2,8 @@ //! # Impl function of tendermint ABCI //! +use fp_storage::BorrowMut; + mod utils; use { @@ -614,7 +616,10 @@ pub fn commit(s: &mut ABCISubmissionServer, req: &RequestCommit) -> ResponseComm IN_SAFE_ITV.store(false, Ordering::Release); if let Some(eth_api_base_app) = &s.eth_api_base_app { - pnk!(eth_api_base_app.write().secondary_catch_up_primary()); + pnk!(eth_api_base_app + .write() + .borrow_mut() + .secondary_catch_up_primary()); } if CFG.enable_enterprise_web3 && td_height as u64 > *WEB3_SERVICE_START_HEIGHT { diff --git a/src/components/contracts/baseapp/Cargo.toml b/src/components/contracts/baseapp/Cargo.toml index a8b54a94a..c5285f777 100644 --- a/src/components/contracts/baseapp/Cargo.toml +++ b/src/components/contracts/baseapp/Cargo.toml @@ -22,8 +22,8 @@ protobuf = "2.16" ruc = "1.0" serde = {version = "1.0.124", features = ["derive"]} serde_json = "1.0.40" -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } -fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } +fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } sha3 = "0.8" zei = { git = "https://github.com/FindoraNetwork/zei", branch = "stable-main" } diff --git a/src/components/contracts/baseapp/src/lib.rs b/src/components/contracts/baseapp/src/lib.rs index a9385d934..35c889ecd 100644 --- a/src/components/contracts/baseapp/src/lib.rs +++ b/src/components/contracts/baseapp/src/lib.rs @@ -297,13 +297,15 @@ impl BaseApp { event_notify: Arc::new(Notifications::new()), }) } - pub fn secondary_catch_up_primary(&self) -> Result<()> { + pub fn secondary_catch_up_primary(&mut self) -> Result<()> { self.chain_state - .read() + .write() + .borrow_mut() .secondary_catch_up_primary() .map_err(|e| eg!("chain_state secondary_catch_up_primary fail:{}", e))?; self.chain_db - .read() + .write() + .borrow_mut() .secondary_catch_up_primary() .map_err(|e| eg!("chain_db secondary_catch_up_primary fail:{}", e)) } diff --git a/src/components/contracts/modules/account/Cargo.toml b/src/components/contracts/modules/account/Cargo.toml index 25c32db4e..344e8b23e 100644 --- a/src/components/contracts/modules/account/Cargo.toml +++ b/src/components/contracts/modules/account/Cargo.toml @@ -15,7 +15,7 @@ primitive-types = { version = "0.11.1", default-features = false, features = ["r ruc = "1.0" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } # primitives, don't depend on any modules fp-core = { path = "../../primitives/core" } @@ -29,4 +29,4 @@ config = { path = "../../../config"} rand_chacha = "0.2" parking_lot = "0.12" zei = { git = "https://github.com/FindoraNetwork/zei", branch = "stable-main" } -fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } diff --git a/src/components/contracts/modules/ethereum/Cargo.toml b/src/components/contracts/modules/ethereum/Cargo.toml index 81a303392..bdc7936e6 100644 --- a/src/components/contracts/modules/ethereum/Cargo.toml +++ b/src/components/contracts/modules/ethereum/Cargo.toml @@ -37,8 +37,8 @@ enterprise-web3 = { path = "../../primitives/enterprise-web3" } baseapp = { path = "../../baseapp" } fp-mocks = { path = "../../primitives/mocks" } module-account = { path = "../account" } -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } -fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } +fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } [features] default = [] diff --git a/src/components/contracts/modules/evm/Cargo.toml b/src/components/contracts/modules/evm/Cargo.toml index 9e09a61de..1b8d91433 100644 --- a/src/components/contracts/modules/evm/Cargo.toml +++ b/src/components/contracts/modules/evm/Cargo.toml @@ -35,8 +35,8 @@ fp-traits = { path = "../../primitives/traits" } fp-types = { path = "../../primitives/types" } fp-utils = { path = "../../primitives/utils" } config = { path = "../../../config"} -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } -fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } +fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } ledger = { path = "../../../../ledger" } enterprise-web3 = { path = "../../primitives/enterprise-web3" } module-ethereum = { path = "../ethereum" } diff --git a/src/components/contracts/primitives/core/Cargo.toml b/src/components/contracts/primitives/core/Cargo.toml index 30a1ec64c..b30314cb0 100644 --- a/src/components/contracts/primitives/core/Cargo.toml +++ b/src/components/contracts/primitives/core/Cargo.toml @@ -16,8 +16,8 @@ parking_lot = "0.12" primitive-types = { version = "0.11.1", default-features = false, features = ["rlp", "byteorder", "serde"] } ruc = "1.0" serde = { version = "1.0.124", features = ["derive"] } -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7", optional = true } -fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7", optional = true } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8", optional = true } +fin_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8", optional = true } serde_with = { version = "1.9.4"} # primitives diff --git a/src/components/contracts/primitives/storage/Cargo.toml b/src/components/contracts/primitives/storage/Cargo.toml index 5aeaa646d..6c986f7b5 100644 --- a/src/components/contracts/primitives/storage/Cargo.toml +++ b/src/components/contracts/primitives/storage/Cargo.toml @@ -15,11 +15,11 @@ ruc = "1.0" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0" sha2 = "0.9.5" -storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +storage = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" } # primitives fp-core = { path = "../core" } config = { path = "../../../config"} [dev-dependencies] -temp_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.7" } +temp_db = { git = "https://github.com/FindoraNetwork/storage.git", tag = "v1.1.8" }