Merge pull request #1036 from Setheum-Labs/dev0x

Dev0x

README.md

@@ -1,6 +1,6 @@
 بِسْمِ اللَّهِ الرَّحْمَنِ الرَّحِيم
 
-# Setheum - Powering The New Internet
+# Setheum - Powering Light-Speed Web3 Solutions
 
 <p align="center">
   <img src="./media/SetheumLabel.jpg" style="width:1300px" />
@@ -33,10 +33,10 @@ Setheum's Blockchain Network node Implementation in Rust, ready for hacking :roc
 [![Twitter URL](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2FSetheum)](https://twitter.com/Setheum)
 [![Telegram](https://img.shields.io/badge/Telegram-gray?logo=telegram)](https://t.me/SetheumNetwork)
 [![Medium](https://img.shields.io/badge/Medium-gray?logo=medium)](https://medium.com/setheum-labs)
-
+[![Lines of Code](https://img.shields.io/badge/LinesOfCode-gray?logo=LinesOfCode)](https://cloc.info/github.com/Setheum-Labs/Setheum)
 </div>
 
-> NOTE: SETHEUM means `Salam Ethereum`, it also means `The house of gifts` from the name `Seth/Sheeth` meaning `gift` in hebrew and the name of the Prophet Sheeth/Seth in Islam,  it also stands for `Secure, Evergreen, Truthful, Heterogeneous, Economically Unbiased Market`.
+> NOTE: SETHEUM means `Salam Eth`, `Super Eth`, `The house of gifts` and `gifted`. Originally from the name `Seth/Sheeth` mixed with `Ethereum`, it also stands for `Secure, Evergreen, Truthful, Heterogeneous, Economically Unbiased Market`.
 
 <!-- TOC -->
 - [Setheum - Powering The New Internet](#setheum---powering-the-new-internet)
@@ -78,7 +78,7 @@ Setheum is a light-speed decentralised blockchain network with EVM and WASM smar
 
 ### 1.2. Ethical DeFi
 
-Ethical DeFi Suite is the DeFi powerhouse of the Setheum Network, providing all kinds of top notch DeFi protocols including an AMM DEX (inspired by Uniswap v3), Decentralised Liquid Staking and Ethical Zero-interest Halal sStablecoins that gives us the properties of both Fiat and Crypto with SlickUSD (USSD) and the Setter (SETR) using an Ethical Collateralized Debt Position (ECDP) mechanism that is over-Collateralized and multi-Collateralised and stable without compromising decentralisation or economic stability, offering stable cryptocurrencies that have scalable value and reliability, setheum provides just that, backed by crypto assets on an efficient zero-interest debt-based system.
+Ethical DeFi Suite is the DeFi powerhouse of the Setheum Network, providing all kinds of top notch DeFi protocols including an AMM DEX (inspired by Uniswap v3), Ethical Zero-interest Halal Stablecoins that gives us the properties of both Fiat and Crypto with SlickUSD (USSD) and the Setter (SETR) using an Ethical Collateralized Debt Position (ECDP) mechanism that is over-Collateralized and multi-Collateralised and stable without compromising decentralisation or economic stability, offering stable cryptocurrencies that have scalable value and reliability, setheum provides just that, backed by crypto assets on an efficient zero-interest debt-based system.
 
 #### 1.2.1. Ethical DeFi Projects:
 
@@ -87,7 +87,7 @@ Ethical DeFi Suite is the DeFi powerhouse of the Setheum Network, providing all
   - `Edfis Exchange`: AMM (Automated Market Maker) DEX Protocol inspired by Uniswap v3 design
   - `Edfis Launchpad`: Launchpad Crowdsales protocol for bootstrapping pools on Edfis Exchange
   - `Edfis Launchpool`: Launchpool protocol for bootstrapping pools on Edfis Exchange
-  - `Edfis Liquid Staking`: Liquid Staking Protocol
+  - `Edfis Pay`: Decentralised Escrow Payment Protocol
 - `Setter`: Unpegged ECDP Stablecoin
 - `SlickUSD`: USD Pegged ECDP Stablecoin
 

blockchain/modules/ecdp-ussd-engine/src/lib.rs

@@ -56,7 +56,7 @@ use sp_runtime::{
 		Duration,
 	},
 	traits::{
-		AccountIdConversion, BlockNumberProvider, Bounded, One, Saturating, StaticLookup, UniqueSaturatedInto, Zero,
+		AccountIdConversion, Bounded, One, Saturating, StaticLookup, UniqueSaturatedInto, Zero,
 	},
 	transaction_validity::{
 		InvalidTransaction, TransactionPriority, TransactionSource, TransactionValidity, ValidTransaction,
@@ -1296,7 +1296,7 @@ impl<T: Config> LiquidateCollateral<T::AccountId> for LiquidateViaContracts<T> {
 		let stable_coin = T::GetUSSDCurrencyId::get();
 
 		let contracts_by_priority = {
-			let now: usize = frame_system::Pallet::<T>::current_block_number()
+			let now: usize = frame_system::Pallet::<T>::block_number()
 				.try_into()
 				.map_err(|_| ArithmeticError::Overflow)?;
 			// can't fail as ensured `liquidation_contracts_len` non-zero

blockchain/modules/edfis-launchpool/Cargo.toml

@@ -8,36 +8,44 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-parity-scale-codec = {  version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
-sp-runtime = { workspace = true }
-sp-io = { workspace = true }
-sp-std = { workspace = true }
+log = { workspace = true }
+parity-scale-codec = { workspace = true, features = ["derive"] }
+scale-info = { workspace = true }
+frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-
-primitives = { package = "setheum-primitives", path = "../primitives", default-features = false }
-support = { package = "module-support", path = "../support", default-features = false }
-orml-traits = { path = "../submodules/orml/traits", default-features = false }
+sp-arithmetic = { workspace = true }
+sp-runtime = { workspace = true }
+sp-core = { workspace = true }
+sp-std = { workspace = true }
+primitives = { workspace = true }
+orml-traits = { workspace = true }
+module-support = { workspace = true }
 
 [dev-dependencies]
-sp-core = { workspace = true, features = ["std"] }
-pallet-balances = { workspace = true }
-orml-tokens = { workspace = true }
+sp-io = { workspace = true, features = ["std"] }
+pallet-balances = { workspace = true, features = ["std"] }
+module-currencies = { workspace = true, features = ["std"] }
+orml-tokens = { workspace = true, features = ["std"] }
+xcm = { workspace = true, features = ["std"] }
 
 [features]
 default = ["std"]
 std = [
 	"parity-scale-codec/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"sp-io/std",
+	"frame-benchmarking/std",
 	"frame-support/std",
 	"frame-system/std",
-	"primitives/std",
-	"support/std",
+	"module-support/std",
 	"orml-traits/std",
+	"primitives/std",
+	"scale-info/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"frame-benchmarking",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",

blockchain/modules/edfis-launchpool/README.md

@@ -11,10 +11,5 @@ Based on the `LaunchpoolStakingCurrency` set by teams, the protocol takes a `Lau
 
 ### Launchpool Commission Teers
 Below are the commission teers:
- - 1. `LSEE` Pools: No Commissions taken;
- - 2. `LEDF` Pools: No Commissions taken;
- - 3. `SETR` Pools: No Commissions taken;
- - 4. `USSD` Pools: `USSDLaunchpoolCommission` (should be 0.25%)
- - 5. `SEE` Pools: `SEELaunchpoolCommission` (should be 0.5%);
- - 6. `EDF` Pools: `EDFLaunchpoolCommission` (should be 0.5%)
- - 7. Other Tokens Pools: `OtherTokensLaunchpoolCommission` (should be 5%)
+ - 1. `SETR`, `SEE`, `EDF` and `USSD` Pools: No Commissions taken;
+ - 5. Other Tokens Pools: `LaunchpoolCommission` should be 5%;