Skip to content
Snippets Groups Projects
Commit bd6d899f authored by Éloïs's avatar Éloïs
Browse files

feat(runtimes): add pallet atomic swap

parent ad65cefd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Cargo.lock
+ 18
− 0
View file @ bd6d899f
...@@ -1902,6 +1902,7 @@ dependencies = [ ...@@ -1902,6 +1902,7 @@ dependencies = [
"frame-system-benchmarking", "frame-system-benchmarking",
"frame-system-rpc-runtime-api", "frame-system-rpc-runtime-api",
"hex-literal", "hex-literal",
"pallet-atomic-swap",
"pallet-authority-discovery", "pallet-authority-discovery",
"pallet-authority-members", "pallet-authority-members",
"pallet-authorship", "pallet-authorship",
...@@ -1958,6 +1959,7 @@ dependencies = [ ...@@ -1958,6 +1959,7 @@ dependencies = [
"frame-system-benchmarking", "frame-system-benchmarking",
"frame-system-rpc-runtime-api", "frame-system-rpc-runtime-api",
"hex-literal", "hex-literal",
"pallet-atomic-swap",
"pallet-authority-discovery", "pallet-authority-discovery",
"pallet-authority-members", "pallet-authority-members",
"pallet-authorship", "pallet-authorship",
...@@ -2153,6 +2155,7 @@ dependencies = [ ...@@ -2153,6 +2155,7 @@ dependencies = [
"frame-system-benchmarking", "frame-system-benchmarking",
"frame-system-rpc-runtime-api", "frame-system-rpc-runtime-api",
"hex-literal", "hex-literal",
"pallet-atomic-swap",
"pallet-authority-discovery", "pallet-authority-discovery",
"pallet-authority-members", "pallet-authority-members",
"pallet-authorship", "pallet-authorship",
...@@ -4204,6 +4207,21 @@ dependencies = [ ...@@ -4204,6 +4207,21 @@ dependencies = [
"stable_deref_trait", "stable_deref_trait",
] ]
[[package]]
name = "pallet-atomic-swap"
version = "4.0.0-dev"
source = "git+https://github.com/librelois/substrate.git?branch=duniter-monthly-2022-01#277da611dd03bc181b094682acf83138e2ea85aa"
dependencies = [
"frame-support",
"frame-system",
"parity-scale-codec",
"scale-info",
"sp-core",
"sp-io",
"sp-runtime",
"sp-std",
]
[[package]] [[package]]
name = "pallet-authority-discovery" name = "pallet-authority-discovery"
version = "4.0.0-dev" version = "4.0.0-dev"
......
runtime/common/src/pallets_config.rs
+ 16
− 12
View file @ bd6d899f
...@@ -260,6 +260,12 @@ macro_rules! pallets_config { ...@@ -260,6 +260,12 @@ macro_rules! pallets_config {
// UTILITIES // // UTILITIES //
impl pallet_atomic_swap::Config for Runtime {
type Event = Event;
type SwapAction = pallet_atomic_swap::BalanceSwapAction<AccountId, Balances>;
type ProofLimit = frame_support::traits::ConstU32<255>;
}
parameter_types! { parameter_types! {
// One storage item; key size 32, value size 8; . // One storage item; key size 32, value size 8; .
pub const ProxyDepositBase: Balance = deposit(1, 8); pub const ProxyDepositBase: Balance = deposit(1, 8);
...@@ -283,6 +289,16 @@ macro_rules! pallets_config { ...@@ -283,6 +289,16 @@ macro_rules! pallets_config {
type WeightInfo = pallet_proxy::weights::SubstrateWeight<Self>; type WeightInfo = pallet_proxy::weights::SubstrateWeight<Self>;
} }
impl pallet_multisig::Config for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
type DepositBase = DepositBase;
type DepositFactor = DepositFactor;
type MaxSignatories = MaxSignatories;
type WeightInfo = pallet_multisig::weights::SubstrateWeight<Self>;
}
impl pallet_utility::Config for Runtime { impl pallet_utility::Config for Runtime {
type Event = Event; type Event = Event;
type Call = Call; type Call = Call;
...@@ -399,17 +415,5 @@ macro_rules! pallets_config { ...@@ -399,17 +415,5 @@ macro_rules! pallets_config {
type CertRenewablePeriod = SmithCertRenewablePeriod; type CertRenewablePeriod = SmithCertRenewablePeriod;
type ValidityPeriod = SmithValidityPeriod; type ValidityPeriod = SmithValidityPeriod;
} }
// MULTISIG //
impl pallet_multisig::Config for Runtime {
type Event = Event;
type Call = Call;
type Currency = Balances;
type DepositBase = DepositBase;
type DepositFactor = DepositFactor;
type MaxSignatories = MaxSignatories;
type WeightInfo = pallet_multisig::weights::SubstrateWeight<Self>;
}
}; };
} }
runtime/g1/Cargo.toml
+ 6
− 0
View file @ bd6d899f
...@@ -32,6 +32,7 @@ std = [ ...@@ -32,6 +32,7 @@ std = [
'frame-support/std', 'frame-support/std',
'frame-system-rpc-runtime-api/std', 'frame-system-rpc-runtime-api/std',
'frame-system/std', 'frame-system/std',
'pallet-atomic-swap/std',
'pallet-authority-discovery/std', 'pallet-authority-discovery/std',
'pallet-authority-members/std', 'pallet-authority-members/std',
'pallet-babe/std', 'pallet-babe/std',
...@@ -124,6 +125,11 @@ branch = 'duniter-monthly-2022-01' ...@@ -124,6 +125,11 @@ branch = 'duniter-monthly-2022-01'
optional = true optional = true
version = '0.3.1' version = '0.3.1'
[dependencies.pallet-atomic-swap]
default-features = false
git = 'https://github.com/librelois/substrate.git'
branch = 'duniter-monthly-2022-01'
[dependencies.pallet-authority-discovery] [dependencies.pallet-authority-discovery]
default-features = false default-features = false
git = 'https://github.com/librelois/substrate.git' git = 'https://github.com/librelois/substrate.git'
......
runtime/g1/src/lib.rs
+ 15
− 16
View file @ bd6d899f
...@@ -219,27 +219,26 @@ construct_runtime!( ...@@ -219,27 +219,26 @@ construct_runtime!(
// Governance stuff. // Governance stuff.
Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20, Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
// Cunning utilities. // Universal dividend
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 30, UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 30,
Utility: pallet_utility::{Pallet, Call, Event} = 31, UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 31,
// Universal dividend.
UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40,
UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
// Web Of Trust // Web Of Trust
Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 40,
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
// Smiths Sub-Wot // Smiths Sub-Wot
SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 60, SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 62, SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 63, SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Multisig dispatch. // Utilities
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 70, AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 61,
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 62,
Utility: pallet_utility::{Pallet, Call, Event} = 63,
} }
); );
......
runtime/gdev/Cargo.toml
+ 6
− 0
View file @ bd6d899f
...@@ -33,6 +33,7 @@ std = [ ...@@ -33,6 +33,7 @@ std = [
'frame-support/std', 'frame-support/std',
'frame-system-rpc-runtime-api/std', 'frame-system-rpc-runtime-api/std',
'frame-system/std', 'frame-system/std',
'pallet-atomic-swap/std',
'pallet-authority-discovery/std', 'pallet-authority-discovery/std',
'pallet-authority-members/std', 'pallet-authority-members/std',
'pallet-babe/std', 'pallet-babe/std',
...@@ -127,6 +128,11 @@ branch = 'duniter-monthly-2022-01' ...@@ -127,6 +128,11 @@ branch = 'duniter-monthly-2022-01'
optional = true optional = true
version = '0.3.1' version = '0.3.1'
[dependencies.pallet-atomic-swap]
default-features = false
git = 'https://github.com/librelois/substrate.git'
branch = 'duniter-monthly-2022-01'
[dependencies.pallet-authority-discovery] [dependencies.pallet-authority-discovery]
default-features = false default-features = false
git = 'https://github.com/librelois/substrate.git' git = 'https://github.com/librelois/substrate.git'
......
runtime/gdev/src/lib.rs
+ 14
− 15
View file @ bd6d899f
...@@ -266,27 +266,26 @@ construct_runtime!( ...@@ -266,27 +266,26 @@ construct_runtime!(
// Governance stuff // Governance stuff
Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20, Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
// Utilities
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 30,
Utility: pallet_utility::{Pallet, Call, Event} = 31,
// Universal dividend // Universal dividend
UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40, UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 30,
UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 41, UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 31,
// Web Of Trust // Web Of Trust
Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 40,
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
// Smiths Sub-Wot // Smiths Sub-Wot
SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 60, SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 62, SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 63, SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Multisig dispatch. // Utilities
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 70, AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 61,
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 62,
Utility: pallet_utility::{Pallet, Call, Event} = 63,
} }
); );
......
runtime/gtest/Cargo.toml
+ 6
− 0
View file @ bd6d899f
...@@ -32,6 +32,7 @@ std = [ ...@@ -32,6 +32,7 @@ std = [
'frame-support/std', 'frame-support/std',
'frame-system-rpc-runtime-api/std', 'frame-system-rpc-runtime-api/std',
'frame-system/std', 'frame-system/std',
'pallet-atomic-swap/std',
'pallet-authority-discovery/std', 'pallet-authority-discovery/std',
'pallet-authority-members/std', 'pallet-authority-members/std',
'pallet-babe/std', 'pallet-babe/std',
...@@ -124,6 +125,11 @@ branch = 'duniter-monthly-2022-01' ...@@ -124,6 +125,11 @@ branch = 'duniter-monthly-2022-01'
optional = true optional = true
version = '0.3.1' version = '0.3.1'
[dependencies.pallet-atomic-swap]
default-features = false
git = 'https://github.com/librelois/substrate.git'
branch = 'duniter-monthly-2022-01'
[dependencies.pallet-authority-discovery] [dependencies.pallet-authority-discovery]
default-features = false default-features = false
git = 'https://github.com/librelois/substrate.git' git = 'https://github.com/librelois/substrate.git'
......
runtime/gtest/src/lib.rs
+ 15
− 16
View file @ bd6d899f
...@@ -219,27 +219,26 @@ construct_runtime!( ...@@ -219,27 +219,26 @@ construct_runtime!(
// Governance stuff. // Governance stuff.
Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20, Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 20,
// Cunning utilities. // Universal dividend
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 30, UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 30,
Utility: pallet_utility::{Pallet, Call, Event} = 31, UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 31,
// Universal dividend.
UdAccountsStorage: pallet_ud_accounts_storage::{Pallet, Config<T>, Storage} = 40,
UniversalDividend: pallet_universal_dividend::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
// Web Of Trust // Web Of Trust
Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 50, Wot: pallet_duniter_wot::<Instance1>::{Pallet} = 40,
Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 51, Identity: pallet_identity::{Pallet, Call, Config<T>, Storage, Event<T>} = 41,
Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52, Membership: pallet_membership::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 42,
Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53, Cert: pallet_certification::<Instance1>::{Pallet, Call, Config<T>, Storage, Event<T>} = 43,
// Smiths Sub-Wot // Smiths Sub-Wot
SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 60, SmithsSubWot: pallet_duniter_wot::<Instance2>::{Pallet} = 50,
SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 62, SmithsMembership: pallet_membership::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 52,
SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 63, SmithsCert: pallet_certification::<Instance2>::{Pallet, Call, Config<T>, Storage, Event<T>} = 53,
// Multisig dispatch. // Utilities
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 70, AtomicSwap: pallet_atomic_swap::{Pallet, Call, Storage, Event<T>} = 60,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 61,
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 62,
Utility: pallet_utility::{Pallet, Call, Event} = 63,
} }
); );
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment