Merge branch 'main' of github.com:ImbueNetwork/imbue into only-projec…

…t-config Fix as much as i can, all tests run
ImbueNetwork · Nov 24, 2023 · da5a21b · da5a21b
2 parents bf3be27 + 691fff9
commit da5a21b
Show file tree

Hide file tree

Showing 84 changed files with 5,329 additions and 4,529 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/common-traits/Cargo.toml b/libs/common-traits/Cargo.toml
@@ -11,28 +11,29 @@ repository.workspace = true
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["max-encoded-len"] }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "release-polkadot-v1.1.0" }
 
 [features]
-default = ['std']
+default = [ 'std' ]
 try-runtime = [
-    "frame-support/try-runtime",
-    "frame-system/try-runtime",
-    "sp-runtime/try-runtime",
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 std = [
-    "codec/std",
-    "frame-support/std",
-    "sp-runtime/std",
-    "sp-std/std"
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"sp-runtime/std",
+	"sp-std/std",
 ]
diff --git a/libs/common-traits/src/lib.rs b/libs/common-traits/src/lib.rs
@@ -10,8 +10,8 @@
 
 // Ensure we're `no_std` when compiling for WebAssembly.
 #![cfg_attr(not(feature = "std"), no_std)]
-
-use frame_support::dispatch::{Codec, DispatchResultWithPostInfo};
+use codec::Codec;
+use frame_support::dispatch::DispatchResultWithPostInfo;
 use frame_support::Parameter;
 use sp_runtime::traits::{
     AtLeast32BitUnsigned, Bounded, MaybeDisplay, MaybeSerialize, MaybeSerializeDeserialize, Member,

diff --git a/libs/common-types/Cargo.toml b/libs/common-types/Cargo.toml
@@ -8,43 +8,45 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 
-[package.metadata.docs.rs]
-targets = ['x86_64-unknown-linux-gnu']
-
 [dependencies]
-codec = { package = 'parity-scale-codec', version = '3.0.0', features = ['derive'] , default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["max-encoded-len"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
 
-bitflags = "1.3"
-serde = { version = "1.0.119" }
+bitflags = { version = "2.4.1", default-features = false }
+serde = { version = "1.0.188", default-features = false, features = ["alloc", "derive"] }
 
 # substrate dependencies
-sp-std = { git = "https://github.com/paritytech/substrate" , branch = "polkadot-v0.9.43", default-features = false }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false}
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 # local dependencies
 common-traits = { path = '../common-traits', default-features = false }
 
 [dev-dependencies]
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = true }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
 
 [features]
-default = ['std']
+default = [ 'std' ]
+std = [
+	'bitflags/std',
+	'codec/std',
+	'common-traits/std',
+	'frame-support/std',
+	'scale-info/std',
+	'serde/std',
+	'sp-runtime/std',
+	'sp-std/std',
+	'xcm/std',
+]
 try-runtime = [
+	"common-traits/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"sp-runtime/try-runtime",
-	"common-traits/try-runtime"
-]
-std = [
-    'codec/std',
-    'sp-std/std',
-    'frame-support/std',
-    'common-traits/std',
-    'sp-runtime/std'
 ]
 
 
+
diff --git a/libs/common-types/src/milestone_origin.rs b/libs/common-types/src/milestone_origin.rs
@@ -4,13 +4,13 @@ use xcm::latest::{Junction, Junctions::*, MultiLocation};
 use frame_support::{PalletId, sp_runtime::traits::AccountIdConversion};
 
 /// A wrapper around
-pub trait TreasuryOriginConverter<AccountId: Into<[u8; 32]>> {
+pub trait TreasuryOriginConverter {
     fn get_multi_location(
         &self,
     ) -> Result<MultiLocation, TreasuryOriginError>;
 }
 
-impl<AccountId: Into<[u8; 32]>> TreasuryOriginConverter<AccountId> for TreasuryOrigin {
+impl TreasuryOriginConverter for TreasuryOrigin {
     fn get_multi_location(
         &self,
     ) -> Result<MultiLocation, TreasuryOriginError> {

diff --git a/libs/common-types/src/tokens.rs b/libs/common-types/src/tokens.rs
@@ -1,14 +1,24 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 #[derive(
-    Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen,
+    Clone,
+    Copy,
+    PartialOrd,
+    Ord,
+    PartialEq,
+    Eq,
+    Debug,
+    Encode,
+    Decode,
+    TypeInfo,
+    MaxEncodedLen,
+    Default,
+    Serialize,
+    Deserialize,
 )]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Default)]
 pub enum CurrencyId {
     #[default]
     Native,

diff --git a/libs/proofs/Cargo.toml b/libs/proofs/Cargo.toml
@@ -11,18 +11,19 @@ license.workspace = true
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-codec = { package = 'parity-scale-codec', version = '2.0.0', features = ['derive'] , default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
-scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["max-encoded-len"] }
+scale-info = { version = "2.9.0", default-features = false, features = ["derive"] }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 
 [features]
 default = ['std']
 std = [
     'codec/std',
-    "sp-std/std"
+    'scale-info/std',
+    "sp-std/std",
 ]