Salp with rpc

node/primitives/src/lib.rs

@@ -122,3 +122,6 @@ pub type ParaId = u32;
 
 /// The measurement type for counting lease periods (generally the same as `BlockNumber`).
 pub type LeasePeriod = BlockNumber;
+
+/// Index used for the child trie
+pub type TrieIndex = u32;

node/primitives/src/xcm.rs

@@ -41,15 +41,26 @@ impl From<XcmBaseWeight> for u64 {
 	}
 }
 
-/// represent the xcmp transact type
+/// represent the transact type
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode)]
+pub enum ParachainTransactType {
+	Xcm = 0,
+	Proxy = 1,
+}
+
+/// represent the proxy type
 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode)]
 pub enum ParachainTransactProxyType {
 	Primary = 0,
 	Derived = 1,
 }
 
+/// represent the derived proxy account type
 #[repr(u16)]
 pub enum ParachainDerivedProxyAccountType {
 	Salp = 0,
 	Staking = 1,
 }
+
+/// Xcm Message Id
+pub type MessageId = [u8; 32];

node/rpc/Cargo.toml

@@ -18,5 +18,7 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "pol
 pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
 bifrost-flexible-fee-rpc = { path = "../../pallets/flexible-fee/rpc" }
 bifrost-flexible-fee-rpc-runtime-api = { path = "../../pallets/flexible-fee/rpc/runtime-api" }
+bifrost-salp-rpc-api = { path = "../../pallets/salp/rpc" }
+bifrost-salp-rpc-runtime-api = { path = "../../pallets/salp/rpc/runtime-api" }
 zenlink-protocol-rpc = "*"
 zenlink-protocol-runtime-api = "*"

node/rpc/src/lib.rs

@@ -35,7 +35,10 @@ use std::sync::Arc;
 
 use bifrost_flexible_fee_rpc::{FeeRpcApi, FlexibleFeeStruct};
 use bifrost_flexible_fee_rpc_runtime_api::FlexibleFeeRuntimeApi as FeeRuntimeApi;
-use node_primitives::{AccountId, Balance, Block};
+use bifrost_salp_rpc_api::{SalpRpcApi, SalpRpcWrapper};
+use bifrost_salp_rpc_runtime_api::SalpRuntimeApi;
+use node_primitives::{AccountId, Balance, Block, ParaId};
+use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
 pub use sc_rpc_api::DenyUnsafe;
 use sc_transaction_pool_api::TransactionPool;
 use sp_api::ProvideRuntimeApi;
@@ -70,10 +73,9 @@ where
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: FeeRuntimeApi<Block, AccountId>,
 	C::Api: ZenlinkProtocolRuntimeApi<Block, AccountId>,
+	C::Api: SalpRuntimeApi<Block, ParaId, AccountId, Balance>,
 	P: TransactionPool + 'static,
 {
-	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};
-
 	let FullDeps { client, .. } = deps;
 
 	let mut io = RpcExtension::default();
@@ -84,5 +86,7 @@ where
 
 	io.extend_with(ZenlinkProtocolApi::to_delegate(ZenlinkProtocol::new(client.clone())));
 
+	io.extend_with(SalpRpcApi::to_delegate(SalpRpcWrapper::new(client.clone())));
+
 	Ok(io)
 }

node/service/Cargo.toml

@@ -88,6 +88,8 @@ zenlink-protocol-runtime-api = "*"
 
 # Bifrost rpc
 bifrost-flexible-fee-rpc-runtime-api = { path = "../../pallets/flexible-fee/rpc/runtime-api" }
+bifrost-salp-rpc-runtime-api = { path = "../../pallets/salp/rpc/runtime-api" }
+
 
 [features]
 default = [ "std" ]

node/service/src/chain_spec/bifrost.rs

@@ -22,13 +22,14 @@ use std::{
 };
 
 use bifrost_runtime::{
-	constants::currency::DOLLARS, AccountId, AuraId, Balance, BalancesConfig, BlockNumber,
-	CollatorSelectionConfig, CouncilConfig, DemocracyConfig, GenesisConfig, IndicesConfig,
-	ParachainInfoConfig, SessionConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
-	VestingConfig, WASM_BINARY,
+	constants::currency::DOLLARS, AccountId, AuraId, Balance, BalancesConfig, BancorConfig,
+	BlockNumber, CollatorSelectionConfig, CouncilConfig, DemocracyConfig, GenesisConfig,
+	IndicesConfig, ParachainInfoConfig, SessionConfig, SudoConfig, SystemConfig,
+	TechnicalCommitteeConfig, VestingConfig, WASM_BINARY,
 };
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
+use node_primitives::{CurrencyId, TokenSymbol};
 use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use serde::de::DeserializeOwned;
@@ -92,6 +93,12 @@ pub fn bifrost_genesis(
 		aura_ext: Default::default(),
 		parachain_system: Default::default(),
 		vesting: VestingConfig { vesting: vestings },
+		bancor: BancorConfig {
+			bancor_pools: vec![
+				(CurrencyId::Token(TokenSymbol::DOT), 10_000 * DOLLARS),
+				(CurrencyId::Token(TokenSymbol::KSM), 1_000_000 * DOLLARS),
+			],
+		},
 	}
 }
 

node/service/src/collator.rs

@@ -19,6 +19,7 @@
 use std::sync::Arc;
 
 use bifrost_flexible_fee_rpc_runtime_api::FlexibleFeeRuntimeApi as FeeRuntimeApi;
+use bifrost_salp_rpc_runtime_api::SalpRuntimeApi;
 use cumulus_client_consensus_aura::{
 	build_aura_consensus, BuildAuraConsensusParams, SlotProportion,
 };
@@ -28,7 +29,7 @@ use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::ParaId;
-use node_primitives::AccountId;
+use node_primitives::{AccountId, Balance, ParaId as BifrostParaId};
 use sc_client_api::ExecutorProvider;
 use sc_executor::native_executor_instance;
 pub use sc_executor::NativeExecutor;
@@ -335,6 +336,7 @@ where
 	>,
 	RuntimeApi::RuntimeApi: FeeRuntimeApi<Block, AccountId>,
 	RuntimeApi::RuntimeApi: ZenlinkProtocolRuntimeApi<Block, AccountId>,
+	RuntimeApi::RuntimeApi: SalpRuntimeApi<Block, BifrostParaId, AccountId, Balance>,
 	Executor: sc_executor::NativeExecutionDispatch + 'static,
 	RB: Fn(
 			Arc<TFullClient<Block, RuntimeApi, Executor>>,

node/service/src/dev.rs

@@ -62,7 +62,7 @@ pub fn new_partial(
 		FullClient,
 		FullBackend,
 		FullSelectChain,
-		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_consensus::DefaultImportQueue<Block, FullClient>,
 		sc_transaction_pool::FullPool<Block, FullClient>,
 		(
 			sc_finality_grandpa::GrandpaBlockImport<
@@ -202,6 +202,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
+			warp_sync: None,
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -226,7 +227,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
 		keystore: keystore_container.sync_keystore(),
 		task_manager: &mut task_manager,
 		transaction_pool: transaction_pool.clone(),
-		rpc_extensions_builder: Box::new(|_, _| ()),
+		rpc_extensions_builder: Box::new(|_, _| Ok(())),
 		on_demand: None,
 		remote_blockchain: None,
 		backend,

node/service/src/manual.rs

@@ -20,9 +20,11 @@ use std::sync::Arc;
 
 pub use dev_runtime;
 use futures::StreamExt;
+use jsonrpc_core::IoHandler;
 use node_rpc::{self, RpcExtension};
 use sc_consensus::LongestChain;
 pub use sc_executor::NativeExecutor;
+use sc_rpc::Metadata;
 use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager};
 use sc_telemetry::TelemetryWorker;
 
@@ -43,7 +45,7 @@ pub fn new_partial(
 		FullClient,
 		FullBackend,
 		FullSelectChain,
-		sp_consensus::DefaultImportQueue<Block, FullClient>,
+		sc_consensus::DefaultImportQueue<Block, FullClient>,
 		sc_transaction_pool::FullPool<Block, FullClient>,
 		(),
 	>,
@@ -120,6 +122,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			import_queue,
 			on_demand: None,
 			block_announce_validator_builder: None,
+			warp_sync: None,
 		})?;
 
 	if config.offchain_worker.enabled {
@@ -158,7 +161,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 				block_import: client.clone(),
 				env: proposer_factory,
 				client: client.clone(),
-				pool,
+				pool: transaction_pool.clone(),
 				commands_stream,
 				select_chain,
 				consensus_data_provider: None,
@@ -179,8 +182,8 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		let client = client.clone();
 		let transaction_pool = transaction_pool.clone();
 
-		Box::new(move |_deny_unsafe, _| -> node_rpc::RpcExtension {
-			return RpcExtension::default();
+		Box::new(move |_deny_unsafe, _| -> Result<IoHandler<Metadata>, _> {
+			return Ok(RpcExtension::default());
 		})
 	};
 

pallets/salp/Cargo.toml

@@ -12,6 +12,7 @@ frame-support = { git = "https://github.com/paritytech/substrate", branch = "pol
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
 frame-benchmarking = {  git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false, optional = true }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false  }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
 xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.9", default-features = false }
@@ -43,6 +44,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"sp-std/std",
+	"sp-io/std",
 	"sp-runtime/std",
 	"sp-arithmetic/std",
 	"orml-traits/std",

pallets/salp/rpc/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "bifrost-salp-rpc-api"
+version = "0.8.0"
+authors = ["Ron Yang <yrong1997@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+serde = { version = "1.0.124", features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+jsonrpc-core = "15.1.0"
+jsonrpc-core-client = "15.1.0"
+jsonrpc-derive = "15.1.0"
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9" }
+node-primitives = { path = "../../../node/primitives", default-features = false }
+bifrost-salp-rpc-runtime-api = { path = "./runtime-api" }

pallets/salp/rpc/runtime-api/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "bifrost-salp-rpc-runtime-api"
+version = "0.8.0"
+authors = ["Ron Yang<yrong1997@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.9", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"sp-api/std",
+]

pallets/salp/rpc/runtime-api/src/lib.rs

@@ -0,0 +1,35 @@
+// This file is part of Bifrost.
+
+// Copyright (C) 2019-2021 Liebi Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::Codec;
+use sp_api::decl_runtime_apis;
+
+decl_runtime_apis! {
+	pub trait SalpRuntimeApi<ParaId,AccountId, Balance> where
+		ParaId: Codec,
+		AccountId: Codec,
+		Balance: Codec,
+	{
+		fn get_contribution(
+			index: ParaId,
+			who: AccountId
+		) -> Balance;
+	}
+}