Develop (#885)

## Describe your changes v5.4.0 runtime release spec_version: 312 ## Checklist before requesting a review - [x] I have performed a self-review of my code. - [x] If it is a core feature, I have added thorough tests. - [x] I removed all Clippy and Formatting Warnings. - [x] I added required Copyrights.
Polkadex-Substrate · Dec 6, 2023 · f140059 · f140059
2 parents 192cfdf + 5974f72
commit f140059
Show file tree

Hide file tree

Showing 27 changed files with 784 additions and 327 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/check-all-ci-tests.sh b/check-all-ci-tests.sh
@@ -23,4 +23,3 @@ cargo build --features runtime-benchmarks || exit
 ./target/debug/polkadex-node benchmark pallet --pallet "*" --extrinsic "*" --steps 2 --repeat 1 || exit
 cargo clippy -- -D warnings || exit
 cargo test || exit
-RUSTFLAGS="-D warnings" cargo build -p thea-message-handler || exit
diff --git a/nodes/mainnet/Cargo.toml b/nodes/mainnet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "polkadex-node"
-version = "5.4.0"
+version = "5.4.1"
 authors = ["Polkadex OÜ <https://polkadex.trade>"]
 description = "Polkadex main blockchain"
 edition = "2021"

diff --git a/pallets/ocex/Cargo.toml b/pallets/ocex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-ocex-lmp"
-version = "5.3.0"
+version = "5.4.1"
 authors = ["Gautham J <gautham@polkadex.trade>"]
 edition = "2021"
 license = "GNU GPL v3"

diff --git a/pallets/ocex/rpc/Cargo.toml b/pallets/ocex/rpc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-ocex-rpc"
-version = "0.1.0"
+version = "5.4.1"
 edition = "2021"
 
 [dependencies]
@@ -19,8 +19,11 @@ serde_json = { workspace = true, default-features = true }
 polkadex-primitives = { workspace = true }
 sc-rpc-api = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true }
+sp-std = { workspace = true, default-features = false }
 sp-offchain = { workspace = true, default-features = true }
 parking_lot = { workspace = true }
 hash-db = { workspace = true }
 trie-db = { workspace = true }
 sp-trie = { workspace = true }
+rust_decimal = { workspace = true, features = ["scale-codec"], default-features = false }
+pallet-ocex-lmp = { path = "../../ocex" }
diff --git a/pallets/ocex/rpc/runtime-api/src/lib.rs b/pallets/ocex/rpc/runtime-api/src/lib.rs
@@ -18,20 +18,16 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use orderbook_primitives::ObCheckpointRaw;
-use parity_scale_codec::Codec;
+use parity_scale_codec::{Codec, Decode};
 use polkadex_primitives::AssetId;
 use rust_decimal::Decimal;
 use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
 
 sp_api::decl_runtime_apis! {
-	pub trait PolkadexOcexRuntimeApi<AccountId, Hash> where AccountId: Codec, Hash : Codec {
-		fn get_ob_recover_state() ->  Result<Vec<u8>, sp_runtime::DispatchError>;
-		// gets balance from given account of given asset
-		fn get_balance(from: AccountId, of: AssetId) -> Result<Decimal, sp_runtime::DispatchError>;
-		// gets the latest checkpoint from the offchain State
-		fn fetch_checkpoint() -> Result<ObCheckpointRaw, sp_runtime::DispatchError>;
+	pub trait PolkadexOcexRuntimeApi<AccountId, Hash> where AccountId: Codec, Hash : Codec, BTreeMap<AccountId,Vec<AccountId>>: Decode {
+		// Returns all on-chain registered main accounts and it's proxies
+		fn get_main_accounts() -> BTreeMap<AccountId,Vec<AccountId>>;
 		// Returns the asset inventory deviation in the offchain State
-		fn calculate_inventory_deviation() -> Result<BTreeMap<AssetId,Decimal>, sp_runtime::DispatchError>;
+		fn calculate_inventory_deviation(offchain_inventory: BTreeMap<AssetId,Decimal>, last_processed_block: u32) -> Result<BTreeMap<AssetId,Decimal>, sp_runtime::DispatchError>;
 	}
 }