Merge pull request #1019 from Setheum-Labs/dev0x

Dev0x
Setheum-Labs · Mar 13, 2024 · a04c22c · a04c22c
2 parents 8126c53 + 6092421
commit a04c22c
Show file tree

Hide file tree

Showing 121 changed files with 4,226 additions and 1,377 deletions.
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/LICENSE.md → LICENSE b/LICENSE.md → LICENSE
diff --git a/blockchain/modules/airdrop/Cargo.toml b/blockchain/modules/airdrop/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-airdrop"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }

diff --git a/blockchain/modules/airdrop/TODO.md b/blockchain/modules/airdrop/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/asset-registry/Cargo.toml b/blockchain/modules/asset-registry/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-asset-registry"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 log = { workspace = true }

diff --git a/blockchain/modules/asset-registry/TODO.md b/blockchain/modules/asset-registry/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/currencies/Cargo.toml b/blockchain/modules/currencies/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-currencies"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 parity-scale-codec = { workspace = true }

diff --git a/blockchain/modules/currencies/TODO.md b/blockchain/modules/currencies/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/currencies/runtime-api/Cargo.toml b/blockchain/modules/currencies/runtime-api/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-currencies-runtime-api"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 sp-runtime = { workspace = true }

diff --git a/blockchain/modules/ecdp-auctions/Cargo.toml b/blockchain/modules/ecdp-auctions/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-ecdp-auctions"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 log = { workspace = true }

diff --git a/blockchain/modules/ecdp-auctions/TODO.md b/blockchain/modules/ecdp-auctions/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-auctions/src/mock.rs b/blockchain/modules/ecdp-auctions/src/mock.rs
@@ -99,8 +99,8 @@ ord_parameter_types! {
 parameter_types! {
 	pub const GetUSSDCurrencyId: CurrencyId = USSD;
 	pub const MaxAuctionsCount: u32 = 10_000;
-	pub const EcdpUssdTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt");
-	pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating();
+	pub const EcdpUssdTreasuryPalletId: PalletId = PalletId(*b"set/ussdtrsymod");
+	pub TreasuryAccount: AccountId = PalletId(*b"set/ussdtrsyacc").into_account_truncating();
 	pub AlternativeSwapPathJointList: Vec<Vec<CurrencyId>> = vec![
 		vec![EDF],
 	];
@@ -141,7 +141,7 @@ impl PriceProvider<CurrencyId> for MockPriceSource {
 }
 
 parameter_types! {
-	pub const EdfisSwapPalletId: PalletId = PalletId(*b"aca/dexm");
+	pub const EdfisSwapPalletId: PalletId = PalletId(*b"set/edfis");
 	pub const GetExchangeFee: (u32, u32) = (0, 100);
 	pub EnabledTradingPairs: Vec<TradingPair> = vec![
 		TradingPair::from_currency_ids(USSD, BTC).unwrap(),
@@ -157,7 +157,7 @@ impl module_edfis_swap_legacy::Config for Runtime {
 	type TradingPathLimit = ConstU32<4>;
 	type PalletId = EdfisSwapPalletId;
 	type Erc20InfoMapping = ();
-	type SwapDexIncentives = ();
+	type Incentives = ();
 	type WeightInfo = ();
 	type ListingOrigin = EnsureSignedBy<One, AccountId>;
 	type ExtendedProvisioningBlocks = ConstU64<0>;

diff --git a/blockchain/modules/ecdp-emergency-shutdown/Cargo.toml b/blockchain/modules/ecdp-emergency-shutdown/Cargo.toml
@@ -1,50 +1,52 @@
-[package]
-name = "module-ecdp-emergency-shutdown"
-version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
-
-[dependencies]
-scale-info = { workspace = true }
-serde = { workspace = true, optional = true }
-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 }
-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 }
-
-[dev-dependencies]
-sp-core = { workspace = true, features = ["std"] }
-pallet-balances = { workspace = true }
-orml-tokens = { workspace = true }
-
-[features]
-default = ["std"]
-std = [
-	"scale-info/std",
-	"serde",
-	"parity-scale-codec/std",
-	"sp-runtime/std",
-	"sp-std/std",
-	"sp-io/std",
-	"frame-support/std",
-	"frame-system/std",
-	"primitives/std",
-	"support/std",
-	"orml-traits/std",
-]
-runtime-benchmarks = [
-	"frame-support/runtime-benchmarks",
-	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-]
-try-runtime = [
-	"frame-support/try-runtime",
-	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-]
+[package]
+name = "module-ecdp-emergency-shutdown"
+version = "0.9.81-dev"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
+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 }
+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 }
+
+[dev-dependencies]
+sp-core = { workspace = true, features = ["std"] }
+pallet-balances = { workspace = true }
+orml-tokens = { workspace = true }
+
+[features]
+default = ["std"]
+std = [
+	"scale-info/std",
+	"serde",
+	"parity-scale-codec/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"sp-io/std",
+	"frame-support/std",
+	"frame-system/std",
+	"primitives/std",
+	"support/std",
+	"orml-traits/std",
+]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/blockchain/modules/ecdp-emergency-shutdown/TODO.md b/blockchain/modules/ecdp-emergency-shutdown/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-setr-engine/Cargo.toml b/blockchain/modules/ecdp-setr-engine/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-ecdp-setr-engine"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 scale-info = { workspace = true }

diff --git a/blockchain/modules/ecdp-setr-engine/TODO.md b/blockchain/modules/ecdp-setr-engine/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-setr-loans/Cargo.toml b/blockchain/modules/ecdp-setr-loans/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-ecdp-setr-loans"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 scale-info = { workspace = true }

diff --git a/blockchain/modules/ecdp-setr-loans/TODO.md b/blockchain/modules/ecdp-setr-loans/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-setr-treasury/Cargo.toml b/blockchain/modules/ecdp-setr-treasury/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-ecdp-setr-treasury"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 scale-info = { workspace = true }

diff --git a/blockchain/modules/ecdp-setr-treasury/TODO.md b/blockchain/modules/ecdp-setr-treasury/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-ussd-engine/Cargo.toml b/blockchain/modules/ecdp-ussd-engine/Cargo.toml
@@ -1,8 +1,10 @@
 [package]
 name = "module-ecdp-ussd-engine"
 version = "0.9.81-dev"
-authors = ["Setheum Labs"]
-edition = "2021"
+authors.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
 
 [dependencies]
 log = { workspace = true }

diff --git a/blockchain/modules/ecdp-ussd-engine/TODO.md b/blockchain/modules/ecdp-ussd-engine/TODO.md
@@ -8,7 +8,7 @@ This list contains all TODOs in the Repo
   - [1. Introduction](#1-guidelines)
   - [2. Contribution](#2-contribution)
   - [3. Lists](#3-lists)
-  - [4. Tasks](#3-tasks)
+  - [4. Tasks](#4-tasks)
 <!-- /TOC -->
 
 

diff --git a/blockchain/modules/ecdp-ussd-engine/src/mock.rs b/blockchain/modules/ecdp-ussd-engine/src/mock.rs
@@ -117,7 +117,7 @@ impl orml_currencies::Config for Runtime {
 }
 
 parameter_types! {
-	pub const EcdpUssdLoansPalletId: PalletId = PalletId(*b"aca/loan");
+	pub const EcdpUssdLoansPalletId: PalletId = PalletId(*b"set/ussdloan");
 }
 
 impl module_ecdp_ussd_loans::Config for Runtime {
@@ -205,8 +205,8 @@ impl EcdpAuctionsManager<AccountId> for MockEcdpAuctionsManager {
 
 parameter_types! {
 	pub const GetUSSDCurrencyId: CurrencyId = USSD;
-	pub const EcdpUssdTreasuryPalletId: PalletId = PalletId(*b"aca/cdpt");
-	pub TreasuryAccount: AccountId = PalletId(*b"aca/hztr").into_account_truncating();
+	pub const EcdpUssdTreasuryPalletId: PalletId = PalletId(*b"set/ussdtrsymod");
+	pub TreasuryAccount: AccountId = PalletId(*b"set/ussdtrsyacc").into_account_truncating();
 	pub AlternativeSwapPathJointList: Vec<Vec<CurrencyId>> = vec![
 		vec![SEE],
 	];
@@ -227,7 +227,7 @@ impl module_ecdp_ussd_treasury::Config for Runtime {
 }
 
 parameter_types! {
-	pub const EdfisSwapPalletId: PalletId = PalletId(*b"aca/dexm");
+	pub const EdfisSwapPalletId: PalletId = PalletId(*b"set/edfis");
 	pub const GetExchangeFee: (u32, u32) = (0, 100);
 	pub EnabledTradingPairs: Vec<TradingPair> = vec![
 		TradingPair::from_currency_ids(USSD, BTC).unwrap(),
@@ -245,7 +245,7 @@ impl module_edfis_swap_legacy::Config for Runtime {
 	type TradingPathLimit = ConstU32<4>;
 	type PalletId = EdfisSwapPalletId;
 	type Erc20InfoMapping = ();
-	type SwapDexIncentives = ();
+	type Incentives = ();
 	type WeightInfo = ();
 	type ListingOrigin = EnsureSignedBy<One, AccountId>;
 	type ExtendedProvisioningBlocks = ConstU64<0>;
@@ -402,7 +402,7 @@ parameter_types! {
 	pub DefaultLiquidationPenalty: FractionalRate = FractionalRate::try_from(Rate::saturating_from_rational(10, 100)).unwrap();
 	pub MaxSwapSlippageCompareToOracle: Ratio = Ratio::saturating_from_rational(50, 100);
 	pub MaxLiquidationContractSlippage: Ratio = Ratio::saturating_from_rational(80, 100);
-	pub const EcdpUssdEnginePalletId: PalletId = PalletId(*b"aca/cdpe");
+	pub const EcdpUssdEnginePalletId: PalletId = PalletId(*b"set/ussde");
 	pub const SettleErc20EvmOrigin: AccountId = AccountId32::new([255u8; 32]);
 }