Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sno 136 v0.9.12 upgrade #534

Merged
merged 31 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c22f8d9
upped the version of tracing
alistair-singh Nov 3, 2021
d01d851
find/replace
alistair-singh Nov 3, 2021
a84d7c4
added scale-info
alistair-singh Nov 4, 2021
ea2d881
added scale-info to more pallets
alistair-singh Nov 4, 2021
a103c84
more build fixes
alistair-singh Nov 4, 2021
710c95c
fixes
alistair-singh Nov 5, 2021
b53bd72
fixed imports
alistair-singh Nov 5, 2021
b71d00e
removed metadata
alistair-singh Nov 10, 2021
f33d6ca
upped serde and codec versions
alistair-singh Nov 11, 2021
a46ca02
changed BaseCallFilter to Everything
alistair-singh Nov 11, 2021
a93f819
added max instructions to FixedWeightBounds
alistair-singh Nov 11, 2021
f86dafb
added OperationalFeeMultiplier
alistair-singh Nov 11, 2021
4f076c3
import Everything for BaseCallFilter
alistair-singh Nov 11, 2021
d81d068
added missing implementations
alistair-singh Nov 11, 2021
5700784
added force_unreserve implementation
alistair-singh Nov 11, 2021
b08c56d
removed commented code
alistair-singh Nov 11, 2021
17abce9
return Vec from WeakBoundedVec
alistair-singh Nov 11, 2021
7cdbea4
fixed OpaqueMetadata conversion
alistair-singh Nov 11, 2021
a99758c
use BenchmarkError::Stop
alistair-singh Nov 11, 2021
2f408f9
using struct instead of method call
alistair-singh Nov 11, 2021
5985e07
use struct patterns
alistair-singh Nov 11, 2021
2b65b5b
changed mock CallFilter to use Everything
alistair-singh Nov 11, 2021
8f18be9
added scale-info/std to std feature
alistair-singh Nov 12, 2021
34775bb
removed native_executor_instance macro
alistair-singh Nov 13, 2021
8e36cf4
updated jsonrpc
alistair-singh Nov 13, 2021
b62df0f
use tokio_handle
alistair-singh Nov 13, 2021
1943a20
renamed task_executor
alistair-singh Nov 13, 2021
e904752
removed unused imports
alistair-singh Nov 14, 2021
85ec29e
updated @polkadot/api to 6.8.1 because of new metadata
alistair-singh Nov 14, 2021
3f4b69e
rustfmt
alistair-singh Nov 15, 2021
894800f
rustfmt with the right settings
alistair-singh Nov 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added scale-info to more pallets
  • Loading branch information
alistair-singh committed Nov 4, 2021
commit ea2d881cfd71091979a67ed1286ec34266ac01cc
3 changes: 3 additions & 0 deletions parachain/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions parachain/pallets/assets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"] }
hex = { version = "2.1.0", package = "rustc-hex", default-features = false }
serde = { version = "1.0.101", optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions parachain/pallets/nft/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ targets = ["x86_64-unknown-linux-gnu"]
codec = { version = "2.0.0", package = "parity-scale-codec", default-features = false, features = ["derive"] }
hex = { version = "2.1.0", package = "rustc-hex", default-features = false }
serde = { version = "1.0.101", optional = true }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions parachain/primitives/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ serde = { version = "1.0.101", optional = true }
serde_derive = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
snowbridge-ethereum = { path = "../ethereum", default-features = false }
scale-info = { version = "1.0", default-features = false, features = ["derive"] }

frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.12", default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions parachain/primitives/core/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use codec::{Decode, Encode};
use enum_iterator::IntoEnumIterator;
use frame_support::RuntimeDebug;
use frame_support::{scale_info::TypeInfo, RuntimeDebug};
use sp_core::H256;
use sp_runtime::DigestItem;
use sp_std::vec::Vec;
Expand All @@ -21,14 +21,14 @@ impl MessageId {

pub type MessageNonce = u64;

#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, IntoEnumIterator, RuntimeDebug)]
#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, IntoEnumIterator, RuntimeDebug, TypeInfo)]
pub enum ChannelId {
Basic,
Incentivized,
}

/// A message relayed from Ethereum.
#[derive(PartialEq, Clone, Encode, Decode, RuntimeDebug)]
#[derive(PartialEq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
pub struct Message {
/// The raw message data.
pub data: Vec<u8>,
Expand All @@ -40,7 +40,7 @@ pub struct Message {
///
/// This data type allows us to support multiple verification schemes. In the near future,
/// A light-client scheme will be added too.
#[derive(PartialEq, Clone, Encode, Decode, RuntimeDebug)]
#[derive(PartialEq, Clone, Encode, Decode, RuntimeDebug, TypeInfo)]
pub struct Proof {
// The block hash of the block in which the receipt was included.
pub block_hash: H256,
Expand Down