Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion for #11831 #5784

Merged
paritytech-processbot merged 43 commits into from
Jul 27, 2022
Merged

Companion for #11831 #5784

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
602fab8
Companion for #11831
Szegoo Jul 16, 2022
9574cab
commti
Szegoo Jul 16, 2022
8a3513c
fix
Szegoo Jul 17, 2022
43a8e3b
fix
Szegoo Jul 17, 2022
406216c
commit
Szegoo Jul 17, 2022
bfda2ca
fix?
Szegoo Jul 17, 2022
07ded03
added rpc extension
Szegoo Jul 17, 2022
7adf551
fmt
Szegoo Jul 17, 2022
8cd63a6
add dependency
Szegoo Jul 17, 2022
9203b43
added NominationPools to runtimes
Szegoo Jul 17, 2022
003bbf8
implement np
Szegoo Jul 17, 2022
36c761e
implement for kusama & westend
Szegoo Jul 17, 2022
fcdbe38
remove np-rpc from rococco
Szegoo Jul 17, 2022
e794e44
fmt
Szegoo Jul 18, 2022
fb0797a
add np-rpc to the client
Szegoo Jul 18, 2022
7396f0d
fix wrong dependency in client
Szegoo Jul 18, 2022
be79259
remove from client
Szegoo Jul 18, 2022
83a6fda
remove from rpc
Szegoo Jul 18, 2022
64a10b9
fix?
Szegoo Jul 18, 2022
4574a50
switch back
Szegoo Jul 18, 2022
cb22627
fix?
Szegoo Jul 18, 2022
3e4be52
.
Szegoo Jul 18, 2022
d91472c
add rpc extension
Szegoo Jul 23, 2022
7a889c0
fmt
Szegoo Jul 23, 2022
f45201f
fix dependency
Szegoo Jul 23, 2022
28e1935
commit
Szegoo Jul 23, 2022
e67a80a
only implement the api in the runtimes
Szegoo Jul 24, 2022
37700ea
update
Szegoo Jul 26, 2022
284054e
update runtimes
Szegoo Jul 26, 2022
63781b8
update sp-io
Szegoo Jul 26, 2022
c545c7f
Merge branch 'master' into rpc-pending-rewards
Szegoo Jul 26, 2022
c38be6c
update
Szegoo Jul 26, 2022
92f691b
Merge branch 'master' into rpc-pending-rewards
Szegoo Jul 26, 2022
6fa5447
Merge branch 'paritytech:master' into rpc-pending-rewards
Szegoo Jul 26, 2022
b3d0121
Update Cargo.toml
Szegoo Jul 26, 2022
702ef14
Update Cargo.toml
Szegoo Jul 26, 2022
75034cb
Update Cargo.toml
Szegoo Jul 26, 2022
a16ee78
Merge branch 'master' into rpc-pending-rewards
Szegoo Jul 26, 2022
8f3b58d
Merge branch 'rpc-pending-rewards' of github.com:Szegoo/polkadot into…
kianenigma Jul 26, 2022
6af5d45
commit
Szegoo Jul 26, 2022
dd26082
Merge branch 'rpc-pending-rewards' of github.com:Szegoo/polkadot into…
kianenigma Jul 27, 2022
b8bf387
Revert "Merge branch 'rpc-pending-rewards' of github.com:Szegoo/polka…
kianenigma Jul 27, 2022
3174099
upstream.master.into()
kianenigma Jul 27, 2022
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
1 change: 1 addition & 0 deletions runtime/kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "m
pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-nomination-pools-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down
10 changes: 10 additions & 0 deletions runtime/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,6 +2007,16 @@ sp_api::impl_runtime_apis! {
}
}

impl pallet_nomination_pools_rpc_runtime_api::NominationPoolsApi<
Block,
AccountId,
Balance,
> for Runtime {
fn pending_rewards(member: AccountId) -> Balance {
NominationPools::pending_rewards(member)
}
}

#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade() -> (Weight, Weight) {
Expand Down
1 change: 1 addition & 0 deletions runtime/westend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "maste
pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-nomination-pools-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
Expand Down
10 changes: 10 additions & 0 deletions runtime/westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,16 @@ sp_api::impl_runtime_apis! {
}
}

impl pallet_nomination_pools_rpc_runtime_api::NominationPoolsApi<
Block,
AccountId,
Balance,
> for Runtime {
fn pending_rewards(member: AccountId) -> Balance {
NominationPools::pending_rewards(member)
}
}

#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade() -> (frame_support::weights::Weight, frame_support::weights::Weight) {
Expand Down