diff --git a/Cargo.toml b/Cargo.toml
index 3c77aa5cdfb..562ffbbded3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,12 +19,12 @@ futures = "0.1.28"
jsonrpc-core-client = { version = "14.0", features = ["ws"] }
num-traits = { version = "0.2", default-features = false }
parity-scale-codec = { version = "1.0", default-features = false, features = ["derive", "full"] }
-runtime_metadata = { git = "https://github.com/paritytech/substrate/", package = "palette-metadata" }
-runtime_support = { git = "https://github.com/paritytech/substrate/", package = "palette-support" }
+runtime_metadata = { git = "https://github.com/paritytech/substrate/", package = "frame-metadata" }
+runtime_support = { git = "https://github.com/paritytech/substrate/", package = "frame-support" }
runtime_primitives = { git = "https://github.com/paritytech/substrate/", package = "sr-primitives" }
serde = { version = "1.0", features = ["derive"] }
sr-version = { git = "https://github.com/paritytech/substrate/", package = "sr-version" }
-palette-system = { git = "https://github.com/paritytech/substrate/", package = "palette-system" }
+frame-system = { git = "https://github.com/paritytech/substrate/", package = "frame-system" }
pallet-balances = { git = "https://github.com/paritytech/substrate/", package = "pallet-balances" }
pallet-contracts = { git = "https://github.com/paritytech/substrate/", package = "pallet-contracts" }
pallet-indices = { git = "https://github.com/paritytech/substrate/", package = "pallet-indices" }
diff --git a/src/events.rs b/src/events.rs
index 242e792356e..1d4011f0716 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -20,12 +20,12 @@ use crate::{
Metadata,
MetadataError,
},
- palette::balances::Balances,
+ frame::balances::Balances,
System,
SystemEvent,
};
use log;
-use palette_system::Phase;
+use frame_system::Phase;
use parity_scale_codec::{
Codec,
Compact,
diff --git a/src/extrinsic.rs b/src/extrinsic.rs
index 262e2953675..0374273b434 100644
--- a/src/extrinsic.rs
+++ b/src/extrinsic.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with substrate-subxt. If not, see .
-use crate::palette::{
+use crate::frame::{
balances::Balances,
system::System,
};
@@ -40,7 +40,7 @@ use std::marker::PhantomData;
use substrate_primitives::Pair;
/// SignedExtra checks copied from substrate, in order to remove requirement to implement
-/// substrate's `palette_system::Trait`
+/// substrate's `frame_system::Trait`
/// Ensure the runtime version registered in the transaction is the same as at present.
///
diff --git a/src/palette/balances.rs b/src/frame/balances.rs
similarity index 95%
rename from src/palette/balances.rs
rename to src/frame/balances.rs
index b3991cf649d..968dbbdb5f4 100644
--- a/src/palette/balances.rs
+++ b/src/frame/balances.rs
@@ -1,7 +1,7 @@
//! Implements support for the pallet_balances module.
use crate::{
error::Error,
- palette::{
+ frame::{
Call,
system::System,
},
@@ -35,9 +35,9 @@ pub trait Balances: System {
}
/// Blanket impl for using existing runtime types
-impl Balances for T
+impl Balances for T
where
- ::Header: serde::de::DeserializeOwned,
+ ::Header: serde::de::DeserializeOwned,
{
type Balance = T::Balance;
}
diff --git a/src/palette/contracts.rs b/src/frame/contracts.rs
similarity index 99%
rename from src/palette/contracts.rs
rename to src/frame/contracts.rs
index 78a02669d0a..d5da4cd7e1d 100644
--- a/src/palette/contracts.rs
+++ b/src/frame/contracts.rs
@@ -1,6 +1,6 @@
//! Implements support for the pallet_contracts module.
use crate::{
- palette::{
+ frame::{
Call,
balances::Balances,
system::System,
diff --git a/src/palette/mod.rs b/src/frame/mod.rs
similarity index 100%
rename from src/palette/mod.rs
rename to src/frame/mod.rs
diff --git a/src/palette/system.rs b/src/frame/system.rs
similarity index 91%
rename from src/palette/system.rs
rename to src/frame/system.rs
index 039ef118b43..6d985d98cad 100644
--- a/src/palette/system.rs
+++ b/src/frame/system.rs
@@ -1,7 +1,7 @@
-//! Implements support for the palette_system module.
+//! Implements support for the frame_system module.
use crate::{
error::Error,
- palette::{
+ frame::{
Call,
balances::Balances,
},
@@ -29,7 +29,7 @@ use runtime_support::Parameter;
use serde::de::DeserializeOwned;
use std::fmt::Debug;
-/// The subset of the `palette::Trait` that a client must implement.
+/// The subset of the `frame::Trait` that a client must implement.
pub trait System: 'static + Eq + Clone + Debug {
/// Account index (aka nonce) type. This stores the number of previous
/// transactions associated with a sender account.
@@ -80,7 +80,7 @@ pub trait System: 'static + Eq + Clone + Debug {
+ Ord
+ Default;
- /// The address type. This instead of `::Source`.
+ /// The address type. This instead of `::Source`.
type Address: Codec + Clone + PartialEq + Debug;
/// The block header.
@@ -90,9 +90,9 @@ pub trait System: 'static + Eq + Clone + Debug {
}
/// Blanket impl for using existing runtime types
-impl System for T
+impl System for T
where
- ::Header: serde::de::DeserializeOwned,
+ ::Header: serde::de::DeserializeOwned,
{
type Index = T::Index;
type BlockNumber = T::BlockNumber;
diff --git a/src/lib.rs b/src/lib.rs
index de99b260af4..b8eba40e676 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -62,7 +62,7 @@ use crate::{
DefaultExtra,
SignedExtra,
},
- palette::{
+ frame::{
Call,
balances::Balances,
system::{
@@ -84,13 +84,13 @@ mod error;
mod events;
mod extrinsic;
mod metadata;
-mod palette;
+mod frame;
mod rpc;
mod runtimes;
pub use error::Error;
pub use events::RawEvent;
-pub use palette::*;
+pub use frame::*;
pub use rpc::ExtrinsicSuccess;
pub use runtimes::*;
@@ -388,7 +388,7 @@ where
mod tests {
use super::*;
use crate::{
- palette::{
+ frame::{
balances::{
Balances,
BalancesStore,
@@ -530,7 +530,7 @@ mod tests {
let transfer = pallet_balances::Call::transfer(address.clone(), amount);
let call = node_runtime::Call::Balances(transfer);
- let subxt_transfer = crate::palette::balances::transfer::(address, amount);
+ let subxt_transfer = crate::frame::balances::transfer::(address, amount);
let call2 = balances
.call("transfer", subxt_transfer.args)
.unwrap();
@@ -548,7 +548,7 @@ mod tests {
assert_eq!(free_balance_key, free_balance_key2);
let account_nonce =
- >::hashed_key_for(&dest);
+ >::hashed_key_for(&dest);
let account_nonce_key = StorageKey(account_nonce);
let account_nonce_key2 = client
.metadata()
diff --git a/src/rpc.rs b/src/rpc.rs
index 227c8851243..cc7062b4372 100644
--- a/src/rpc.rs
+++ b/src/rpc.rs
@@ -21,7 +21,7 @@ use crate::{
RuntimeEvent,
},
metadata::Metadata,
- palette::{
+ frame::{
balances::Balances,
system::System,
},
@@ -161,9 +161,9 @@ use txpool::watcher::Status;
use crate::{
events::RawEvent,
- palette::system::SystemEvent,
+ frame::system::SystemEvent,
};
-use palette_system::Phase;
+use frame_system::Phase;
type MapClosure = Box T + Send>;
pub type MapStream = stream::Map, MapClosure>;
diff --git a/src/runtimes.rs b/src/runtimes.rs
index b0c92db4b03..e471f39d4bd 100644
--- a/src/runtimes.rs
+++ b/src/runtimes.rs
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with substrate-subxt. If not, see .
-use crate::palette::{
+use crate::frame::{
balances::Balances,
contracts::Contracts,
system::System,