-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/pallet_treasury_funding
- Loading branch information
Showing
16 changed files
with
2,941 additions
and
19 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| use futures::Future; | ||
| use sc_transaction_pool_api::{ | ||
| ImportNotificationStream, PoolFuture, PoolStatus, ReadyTransactions, TransactionFor, | ||
| TransactionPool, TransactionSource, TransactionStatusStreamFor, TxHash, | ||
| }; | ||
| use sp_runtime::traits::{Block as BlockT, NumberFor}; | ||
| use std::{collections::HashMap, pin::Pin, sync::Arc}; | ||
|
|
||
| pub struct CustomPool<I> { | ||
| inner_pool: Arc<I>, | ||
| } | ||
|
|
||
| impl<I> CustomPool<I> { | ||
| pub fn new(inner_pool: Arc<I>) -> Self { | ||
| Self { inner_pool } | ||
| } | ||
| } | ||
|
|
||
| impl<I> TransactionPool for CustomPool<I> | ||
| where | ||
| I: TransactionPool, | ||
| { | ||
| type Block = I::Block; | ||
| type Hash = I::Hash; | ||
| type InPoolTransaction = I::InPoolTransaction; | ||
| type Error = I::Error; | ||
|
|
||
| fn submit_at( | ||
| &self, | ||
| at: <Self::Block as BlockT>::Hash, | ||
| source: TransactionSource, | ||
| xts: Vec<TransactionFor<Self>>, | ||
| ) -> PoolFuture<Vec<Result<TxHash<Self>, Self::Error>>, Self::Error> { | ||
| self.inner_pool.submit_at(at, source, xts) | ||
| } | ||
|
|
||
| fn submit_one( | ||
| &self, | ||
| at: <Self::Block as BlockT>::Hash, | ||
| source: TransactionSource, | ||
| xt: TransactionFor<Self>, | ||
| ) -> PoolFuture<TxHash<Self>, Self::Error> { | ||
| self.inner_pool.submit_one(at, source, xt) | ||
| } | ||
|
|
||
| fn submit_and_watch( | ||
| &self, | ||
| at: <Self::Block as BlockT>::Hash, | ||
| source: TransactionSource, | ||
| xt: TransactionFor<Self>, | ||
| ) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> { | ||
| self.inner_pool.submit_and_watch(at, source, xt) | ||
| } | ||
|
|
||
| fn remove_invalid(&self, _: &[TxHash<Self>]) -> Vec<Arc<Self::InPoolTransaction>> { | ||
| // Don't do anything on purpose. | ||
| Vec::new() | ||
| } | ||
|
|
||
| fn status(&self) -> PoolStatus { | ||
| self.inner_pool.status() | ||
| } | ||
|
|
||
| fn import_notification_stream(&self) -> ImportNotificationStream<TxHash<Self>> { | ||
| self.inner_pool.import_notification_stream() | ||
| } | ||
|
|
||
| fn hash_of(&self, xt: &TransactionFor<Self>) -> TxHash<Self> { | ||
| self.inner_pool.hash_of(xt) | ||
| } | ||
|
|
||
| fn on_broadcasted(&self, propagations: HashMap<TxHash<Self>, Vec<String>>) { | ||
| self.inner_pool.on_broadcasted(propagations) | ||
| } | ||
|
|
||
| fn ready_transaction(&self, hash: &TxHash<Self>) -> Option<Arc<Self::InPoolTransaction>> { | ||
| self.inner_pool.ready_transaction(hash) | ||
| } | ||
|
|
||
| fn ready_at( | ||
| &self, | ||
| at: NumberFor<Self::Block>, | ||
| ) -> Pin< | ||
| Box< | ||
| dyn Future< | ||
| Output = Box<dyn ReadyTransactions<Item = Arc<Self::InPoolTransaction>> + Send>, | ||
| > + Send, | ||
| >, | ||
| > { | ||
| self.inner_pool.ready_at(at) | ||
| } | ||
|
|
||
| fn ready(&self) -> Box<dyn ReadyTransactions<Item = Arc<Self::InPoolTransaction>> + Send> { | ||
| self.inner_pool.ready() | ||
| } | ||
|
|
||
| fn futures(&self) -> Vec<Self::InPoolTransaction> { | ||
| self.inner_pool.futures() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| [package] | ||
| name = "pallet-treasury" | ||
| version = "36.0.1" | ||
| authors.workspace = true | ||
| edition.workspace = true | ||
| license = "Apache-2.0" | ||
| homepage = "https://substrate.io" | ||
| repository.workspace = true | ||
| description = "FRAME pallet to manage treasury (polkadot v1.15.0)" | ||
| readme = "README.md" | ||
|
|
||
| [package.metadata.docs.rs] | ||
| targets = ["x86_64-unknown-linux-gnu"] | ||
|
|
||
| [dependencies] | ||
| parity-scale-codec = { features = [ | ||
| "derive", | ||
| "max-encoded-len", | ||
| ], workspace = true } | ||
| docify = { version = "0.2.8" } | ||
| impl-trait-for-tuples = { version = "0.2.2" } | ||
| scale-info = { features = ["derive"], workspace = true } | ||
| serde = { features = ["derive"], optional = true, workspace = true, default-features = true } | ||
| frame-benchmarking = { optional = true, workspace = true } | ||
| frame-support.workspace = true | ||
| frame-system.workspace = true | ||
| pallet-balances.workspace = true | ||
| sp-runtime.workspace = true | ||
| sp-core = { optional = true, workspace = true } | ||
| log = { workspace = true } | ||
|
|
||
| [dev-dependencies] | ||
| sp-io = { default-features = true, workspace = true } | ||
| pallet-utility = { default-features = true, workspace = true } | ||
|
|
||
| [features] | ||
| default = ["std"] | ||
| std = [ | ||
| "parity-scale-codec/std", | ||
| "frame-benchmarking?/std", | ||
| "frame-support/std", | ||
| "frame-system/std", | ||
| "log/std", | ||
| "pallet-balances/std", | ||
| "scale-info/std", | ||
| "serde", | ||
| "sp-core?/std", | ||
| "sp-runtime/std", | ||
| ] | ||
| runtime-benchmarks = [ | ||
| "dep:sp-core", | ||
| "frame-benchmarking/runtime-benchmarks", | ||
| "frame-support/runtime-benchmarks", | ||
| "frame-system/runtime-benchmarks", | ||
| "pallet-balances/runtime-benchmarks", | ||
| "sp-runtime/runtime-benchmarks", | ||
| ] | ||
| try-runtime = [ | ||
| "frame-support/try-runtime", | ||
| "frame-system/try-runtime", | ||
| "pallet-balances/try-runtime", | ||
| "sp-runtime/try-runtime", | ||
| ] |
Oops, something went wrong.