Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate",
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }

zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "0a96d66fba0b8173381ff5d03a33bb7943b4f457"}
zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "0a96d66fba0b8173381ff5d03a33bb7943b4f457" }
zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "0a96d66fba0b8173381ff5d03a33bb7943b4f457" }
zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "f6ca2a8e0babb19e1a6e9309ce3e9b5b53f7a703"}
zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "f6ca2a8e0babb19e1a6e9309ce3e9b5b53f7a703" }
zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", rev = "f6ca2a8e0babb19e1a6e9309ce3e9b5b53f7a703" }

orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "5ba42f532b72d71a28aaa18421855de003b9ca71" }
orml-currencies = {git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "5ba42f532b72d71a28aaa18421855de003b9ca71" }
Expand Down
2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node-cli"
version = "0.9.8"
version = "0.9.10"
authors = ["Liebi Technologies <bifrost@liebi.com>"]
description = "Bifrost Parachain Node"
build = "build.rs"
Expand Down
3 changes: 0 additions & 3 deletions pallets/flexible-fee/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,6 @@ where
// Calculate how much refund we should return
let refund_amount = paid.peek().saturating_sub(corrected_fee);

#[cfg(feature = "std")]
println!("refund_amount: {:?}", refund_amount);

// refund to the the account that paid the fees. If this fails, the
// account might have dropped below the existential balance. In
// that case we don't refund anything.
Expand Down
1 change: 1 addition & 0 deletions pallets/liquidity-mining/rpc/runtime-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ decl_runtime_apis! {
fn get_rewards(
who: AccountId,
pid: PoolId,
pallet_instance: u32,
) -> Vec<(CurrencyId, Balance)>;
}
}
5 changes: 4 additions & 1 deletion pallets/liquidity-mining/rpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pub trait LiquidityMiningRpcApi<BlockHash, AccountId, PoolId> {
&self,
who: AccountId,
pid: PoolId,
pallet_instance: u32,
at: Option<BlockHash>,
) -> JsonRpcResult<Vec<(CurrencyId, NumberOrHex)>>;
}
Expand Down Expand Up @@ -67,12 +68,14 @@ where
&self,
who: AccountId,
pid: PoolId,
pallet_instance: u32,
at: Option<<Block as BlockT>::Hash>,
) -> JsonRpcResult<Vec<(CurrencyId, NumberOrHex)>> {
let lm_rpc_api = self.client.runtime_api();
let at = BlockId::<Block>::hash(at.unwrap_or_else(|| self.client.info().best_hash));

let rs: Result<Vec<(CurrencyId, Balance)>, _> = lm_rpc_api.get_rewards(&at, who, pid);
let rs: Result<Vec<(CurrencyId, Balance)>, _> =
lm_rpc_api.get_rewards(&at, who, pid, pallet_instance);

match rs {
Ok(rewards) => Ok(rewards
Expand Down
Loading