From 5859cefc62508402534746f0ca931fda108a66a4 Mon Sep 17 00:00:00 2001 From: Gav Date: Sun, 15 Jul 2018 13:35:21 +0200 Subject: [PATCH] Avoid accounts destroyed in payments from being aux --- polkadot/service/src/chain_spec.rs | 6 +----- substrate/runtime/staking/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/polkadot/service/src/chain_spec.rs b/polkadot/service/src/chain_spec.rs index fe2bcb71bb56b..b03a6a60054a6 100644 --- a/polkadot/service/src/chain_spec.rs +++ b/polkadot/service/src/chain_spec.rs @@ -93,11 +93,7 @@ fn staging_testnet_config_genesis() -> GenesisConfig { /// Staging testnet config. pub fn staging_testnet_config() -> ChainSpec { - let boot_nodes = vec![ - "enode://a93a29fa68d965452bf0ff8c1910f5992fe2273a72a1ee8d3a3482f68512a61974211ba32bb33f051ceb1530b8ba3527fc36224ba6b9910329025e6d9153cf50@104.211.54.233:30333".into(), - "enode://051b18f63a316c4c5fef4631f8c550ae0adba179153588406fac3e5bbbbf534ebeda1bf475dceda27a531f6cdef3846ab6a010a269aa643a1fec7bff51af66bd@104.211.48.51:30333".into(), - "enode://c831ec9011d2c02d2c4620fc88db6d897a40d2f88fd75f47b9e4cf3b243999acb6f01b7b7343474650b34eeb1363041a422a91f1fc3850e43482983ee15aa582@104.211.48.247:30333".into(), - ]; + let boot_nodes = vec![]; ChainSpec::from_genesis("Staging Testnet", staging_testnet_config_genesis, boot_nodes) } diff --git a/substrate/runtime/staking/src/lib.rs b/substrate/runtime/staking/src/lib.rs index af15e15324293..5ad43f048ce16 100644 --- a/substrate/runtime/staking/src/lib.rs +++ b/substrate/runtime/staking/src/lib.rs @@ -876,7 +876,7 @@ impl MakePayment for Module { fn make_payment(transactor: &T::AccountId, encoded_len: usize) -> Result { let b = Self::free_balance(transactor); let transaction_fee = Self::transaction_base_fee() + Self::transaction_byte_fee() * >::sa(encoded_len as u64); - if b < transaction_fee { + if b < transaction_fee + Self::existential_deposit() { return Err("not enough funds for transaction fee"); } >::insert(transactor, b - transaction_fee);