Skip to content

Commit

Permalink
lift patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@brenzi
brenzi committed Apr 10, 2024
2 parents dd89fae + e1620df commit a3aca84
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 34 deletions.
75 changes: 67 additions & 8 deletions Cargo.lock
View file

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

51 changes: 26 additions & 25 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ pallet-encointer-scheduler = { default-features = false, version = "~6.1.0" }
pallet-encointer-bazaar-rpc = "~6.1.0"
pallet-encointer-ceremonies-rpc = "~6.1.0"
pallet-encointer-communities-rpc = "~6.1.0"
encointer-balances-tx-payment-rpc = "~6.1.0"

# fellowship runtimes. do not depend on fellow-runtimes directly, so we can upgrade at our own pace
kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "ab/upgrade-encointer-to-6.1" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "ab/upgrade-encointer-to-6.1" }
kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "ab/introduce_collator-selection" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "ab/introduce_collator-selection" }

# polkadot-sdk [no_std]
cumulus-pallet-aura-ext = { default-features = false, version = "0.8.0" }
Expand Down Expand Up @@ -144,26 +145,26 @@ substrate-build-script-utils = "11.0.0"
substrate-prometheus-endpoint = "0.17.0"

# ### only while debugging/developping
[patch."https://github.com/encointer/runtimes"]
kusama-runtime-constants = { path = "../runtimes/relay/kusama/constants" }
parachain-runtime = { package = "encointer-kusama-runtime", path = "../runtimes/system-parachains/encointer" }

[patch.crates-io]
encointer-balances-tx-payment = { path = "../pallets/balances-tx-payment" }
encointer-balances-tx-payment-rpc = { path = "../pallets/balances-tx-payment/rpc" }
encointer-balances-tx-payment-rpc-runtime-api = { path = "../pallets/balances-tx-payment/rpc/runtime-api" }
encointer-ceremonies-assignment = { path = "../pallets/ceremonies/assignment" }
encointer-primitives = { path = "../pallets/primitives" }
pallet-encointer-ceremonies = { path = "../pallets/ceremonies" }
pallet-encointer-ceremonies-rpc = { path = "../pallets/ceremonies/rpc" }
pallet-encointer-ceremonies-rpc-runtime-api = { path = "../pallets/ceremonies/rpc/runtime-api" }
pallet-encointer-communities = { path = "../pallets/communities" }
pallet-encointer-communities-rpc = { path = "../pallets/communities/rpc" }
pallet-encointer-communities-rpc-runtime-api = { path = "../pallets/communities/rpc/runtime-api" }
pallet-encointer-balances = { path = "../pallets/balances" }
pallet-encointer-scheduler = { path = "../pallets/scheduler" }
pallet-encointer-bazaar = { path = "../pallets/bazaar" }
pallet-encointer-bazaar-rpc = { path = "../pallets/bazaar/rpc" }
pallet-encointer-bazaar-rpc-runtime-api = { path = "../pallets/bazaar/rpc/runtime-api" }
pallet-encointer-faucet = { path = "../pallets/faucet" }
pallet-encointer-reputation-commitments = { path = "../pallets/reputation-commitments" }
#[patch."https://github.com/encointer/runtimes"]
#kusama-runtime-constants = { path = "../runtimes/relay/kusama/constants" }
#parachain-runtime = { package = "encointer-kusama-runtime", path = "../runtimes/system-parachains/encointer" }
#
#[patch.crates-io]
#encointer-balances-tx-payment = { path = "../pallets/balances-tx-payment" }
#encointer-balances-tx-payment-rpc = { path = "../pallets/balances-tx-payment/rpc" }
#encointer-balances-tx-payment-rpc-runtime-api = { path = "../pallets/balances-tx-payment/rpc/runtime-api" }
#encointer-ceremonies-assignment = { path = "../pallets/ceremonies/assignment" }
#encointer-primitives = { path = "../pallets/primitives" }
#pallet-encointer-ceremonies = { path = "../pallets/ceremonies" }
#pallet-encointer-ceremonies-rpc = { path = "../pallets/ceremonies/rpc" }
#pallet-encointer-ceremonies-rpc-runtime-api = { path = "../pallets/ceremonies/rpc/runtime-api" }
#pallet-encointer-communities = { path = "../pallets/communities" }
#pallet-encointer-communities-rpc = { path = "../pallets/communities/rpc" }
#pallet-encointer-communities-rpc-runtime-api = { path = "../pallets/communities/rpc/runtime-api" }
#pallet-encointer-balances = { path = "../pallets/balances" }
#pallet-encointer-scheduler = { path = "../pallets/scheduler" }
#pallet-encointer-bazaar = { path = "../pallets/bazaar" }
#pallet-encointer-bazaar-rpc = { path = "../pallets/bazaar/rpc" }
#pallet-encointer-bazaar-rpc-runtime-api = { path = "../pallets/bazaar/rpc/runtime-api" }
#pallet-encointer-faucet = { path = "../pallets/faucet" }
#pallet-encointer-reputation-commitments = { path = "../pallets/reputation-commitments" }
1 change: 1 addition & 0 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ serde_json = { workspace = true }
parachain-runtime = { workspace = true, features = ["std"] }

# encointer dependencies
encointer-balances-tx-payment-rpc = { workspace = true }
encointer-balances-tx-payment-rpc-runtime-api = { workspace = true, features = ["std"] }
pallet-encointer-bazaar-rpc = { workspace = true }
pallet-encointer-bazaar-rpc-runtime-api = { workspace = true, features = ["std"] }
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

use cumulus_primitives_core::ParaId;
use parachain_runtime::{BalanceType, CeremonyPhaseType};
use parachains_common::{AccountId, AuraId, Balance};
use parachains_common::{AccountId, Balance};
use parity_scale_codec::{Decode, Encode};
use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
use serde::{Deserialize, Serialize};
Expand Down
2 changes: 2 additions & 0 deletions node/src/rpc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ where
TBackend: sc_client_api::Backend<Block>, // added by encointer
<TBackend as sc_client_api::Backend<Block>>::OffchainStorage: 'static, // added by encointer
{
use encointer_balances_tx_payment_rpc::{BalancesTxPaymentApiServer, BalancesTxPaymentRpc};
use frame_rpc_system::{System, SystemApiServer};
use pallet_encointer_bazaar_rpc::{BazaarApiServer, BazaarRpc};
use pallet_encointer_ceremonies_rpc::{CeremoniesApiServer, CeremoniesRpc};
Expand All @@ -72,6 +73,7 @@ where

module.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?;
module.merge(TransactionPayment::new(client.clone()).into_rpc())?;
module.merge(BalancesTxPaymentRpc::new(client.clone()).into_rpc())?;
module.merge(BazaarRpc::new(client.clone()).into_rpc())?;

match backend.offchain_storage() {
Expand Down

0 comments on commit a3aca84

Please sign in to comment.