1. Aug 30, 2018
    • Gav Wood's avatar
      Separate out staking module into balances and payment (#629) · 7c10a6c9
      Gav Wood authored
      * Initial commit.
      
      * Split out balances module
      
      * Minimise Balances trait requirements
      
      * Fix up balances, remove balances stuff from staking
      
      * Split off and fix up staking module
      
      * Fix executive tests
      
      * Fix up democracy module
      
      * make council work again
      
      * Remove unneeded cruft from democracy
      
      * Fix up contract module
      
      * Fix up rest of tests
      
      * Fix minor TODOs
      
      * Fix tests
      
      * Remove superfluous code
      
      * Move offline inherents to consensus module.
      
      Fixes #630
      
      * Version needs Decode.
      
      * Move Decode back
      
      * Fix nits
      
      * Refactor to allow custom message
      7c10a6c9
    • Denis S. Soldatov aka General-Beck's avatar
      Update .gitlab-ci.yml (#633) · 2d2f1501
      Denis S. Soldatov aka General-Beck authored
      it is necessary to test.
      You will probably have to create a cron-job for the nightly assembly of the master branch
      2d2f1501
  2. Aug 29, 2018
  3. Aug 28, 2018
  4. Aug 27, 2018
    • Gav Wood's avatar
      New slashing logic (#570) · 6b0d3453
      Gav Wood authored
      * New slashing mechanism (#554)
      
      * Slashing improvements
      
      - unstake when balance too low
      - unstake after N slashes according to val prefs
      - don't early-terminate session/era unless unstaked
      - offline grace period before punishment
      
      * Fix warning
      
      * Cleanups and ensure slash_count decays
      
      * Bump authoring version and introduce needed authoring stub
      
      * Rename
      
      * Fix offline tracker
      
      * Fix offline tracker
      
      * Renames
      
      * Add test
      
      * Tests
      
      * Tests.
      
      * Remove accidental merge files.
      
      * Version bump, fixes (#572)
      
      * Bump version, don't propose invalid blocks
      
      * Fix build.
      
      * Fixes.
      
      * More fixes.
      
      * Fix tests.
      
      * Fix more tests
      
      * More tests fixed
      
      * Fix merge
      
      * Fix accidental merge bug
      
      * Fixes.
      
      * Staking failsafes
      
      - Don't slash/unstake/change session when too few staking participants
      - Introduce set_balance PrivCall
      
      * Make minimum validator count dynamic.
      
      * test fixes
      
      * Fix tests.
      
      * Fix tests
      
      * Fix tests, update readme.
      
      * Test with release.
      
      * Use safe math when dealing with total stake
      
      * Fix test again.
      
      * Fix grumbles.
      6b0d3453
    • Sergey Pepyakin's avatar
      Contract signatures checking (#478) · 874550c7
      Sergey Pepyakin authored
      * Convert T in vm::Ext to a associated type
      
      * WIP
      
      * Fix BTreeMap
      
      * Extract prepare module from vm.
      
      * Move tests as well.
      
      * Fix doc comment.
      
      * macro for env defintion
      
      * Fix prepare tests.
      
      * Clean up
      
      * Renamings
      
      * Refactor scan_imports
      
      * Improve docs
      
      * Docs.
      
      * Add some tests for sandbox module
      
      * Clean up
      
      * Use Error::Instantiate instead of ::Deserialize
      
      * Add test for imports
      
      * Add wrong sig import
      
      * Clean up
      
      * Rebuild binaries.
      
      * Use "another_module" instead of obscure "vne"
      
      Since "vne" looks like an actual typo
      874550c7
    • Guanqun Lu's avatar
      extrinsic-pool: use retain() (#613) · fe88e536
      Guanqun Lu authored
      fe88e536
    • Guanqun Lu's avatar
      rename Polkadot to Substrate in the license header via following four commands (#614) · 10fa5cef
      Guanqun Lu authored
      git grep -l 'This file is part of Polkadot' | xargs sed -i 's/This file is part of Polkadot/This file is part of Substrate/g'
          git grep -l 'Polkadot is free software' | xargs sed -i 's/Polkadot is free software/Substrate is free software/g'
          git grep -l 'Polkadot is distributed in the hope' | xargs sed -i 's/Polkadot is distributed in the hope/Substrate is distributed in the hope/g'
          git grep -l 'along with Polkadot' | xargs sed -i 's/along with Polkadot/along with Substrate/g'
      10fa5cef
  5. Aug 26, 2018
  6. Aug 25, 2018
  7. Aug 24, 2018
  8. Aug 21, 2018
  9. Aug 20, 2018
  10. Aug 19, 2018
  11. Aug 17, 2018
  12. Aug 16, 2018
  13. Aug 15, 2018
    • asynchronous rob's avatar
      remove wasm-publish step · 54e6d763
      asynchronous rob authored
      54e6d763
    • asynchronous rob's avatar
      update script targets · 38335cdf
      asynchronous rob authored
      38335cdf
    • asynchronous rob's avatar
      e3f6cd86
    • Gav Wood's avatar
      Refactor/substrate state machine generic (#553) · 690f52f5
      Gav Wood authored and asynchronous rob's avatar asynchronous rob committed
      * Genric over hasher
      
      * WIP start adding NodeCodec
      
      * Add codec to TrieBackend
      
      * Typechecks
      
      * Fix error type
      
      * Cleanup
      
      * Tests build (and fail)
      
      * Fix tests: don't use MemoryDB::default()
      
      * Lockfile
      
      * Address grumbles
      
      * Teach environmental! about generics
      
      * Add Finder artifacts
      
      * whitespace
      
      * Add a toy impl of Hasher and plug it in to Externalities
      
      * Use `uint` and `fixed-hash` from `parity-common`
      Remove unused U512
      Add test to ensure H256 impls heapsizeof
      
      * lock file updates
      
      * Make hashes Encodable/Decodable
      
      * lock file updates
      
      * Impl FromIterator for TestExternalities so we can collect() and use map!
      
      * Use rustc-hex from crates
      Use rlp from master so dependencies do not mess up the scope
      
      * Fix tests in runtime-io
      
      * lockfile shenanigans
      
      * Add a BlakeHasher impl
      
      * Use BlakeHasher in runtime-io
      
      * lockfile updates
      
      * ws
      
      * Add a Blake2/RLP-flavoured NodeCodec
      
      * Use Blake-flavoured Hasher and NodeCodec
      
      * lockfile
      
      * Implement PartialEq and Default for TestExternalities
      
      * Add note about limitations of environmental!
      
      * Make it compile, but this is probably broken
      
      * Derive Debug so tests in executor can work
      
      * Make executor use BlakeHasher
      
      * ws
      
      * WIP make client generic
      
      * typechecks
      
      * cleanup
      
      * client tests pass
      
      * Fix client/db
      
      * cleanup
      
      * Fix network
      
      * Fix rpc
      
      * Fix service
      
      * Make TestExternalities work better au lieu d'un HashMap
      
      * Fix tests in council
      
      * Fix tests in contract
      
      * Fix tests in council
      
      * Fix democracy
      
      * Add comment about odd-looking reexports in tests
      
      * Don't need to load branch
      
      * Fix staking
      
      * Fix session
      
      * Some polkadot fixes and lockfile
      
      * Fix executive
      
      * fixup lockfile
      
      * Fix polkadot/api
      
      * Fix polkadot/service
      
      * Fix polkadot/runtime tests
      
      * Fix tests in test-runtime
      
      * Test fixes
      
      * Fix missing component in the `std` feature
      
      * Use PhantomData and Result from core
      
      * Fix paths
      Use core
      
      * load heapsize on wasm
      
      * implement `HeapSizeOf` for wasm
      
      * Add toy impl of `blake2_256` for no_std
      
      * lockfile
      
      * Use kvdb* from parity-common and fix errors
      
      * rebuilt lockfile
      
      * Add dummy impl of `on_advance_round` for rhododendron::Context
      
      * Fix build after merge
      
      * Add HeapSizeOf bound where needed
      
      * Sort out dependencies for no_std
      
      * Add HeapSizeOf bound where needed
      
      * use temp branch pending PR merges
      
      * Remove unneeded tests
      
      * Lock file and wasm artifacts
      
      * lockfile
      
      * Use magic commit for libp2p
      
      * Cleanup
      
      * Implement blake2_256 for no_std
      
      * Back on parity-common master
      
      * missing type params
      
      * Update Cargo.lock
      
      * whitespace
      
      * Rename concrete Rlp node codec "RlpCodec" and use everywhere
      Implement a Keccak-flavoured Rlp NodeCodec and use everywhere
      Add a KeccakHasher
      
      * Switch to use KeccakHasher
      
      * Lock file and runtimes
      
      * fixup lockfile
      
      * Fix outstanding issue using concrete types (thanks @gnunicorn)
      
      * Cleanup
      
      * More cleanup
      
      * Comment out Blake2 Hasher
      
      * implement ext_keccak256
      
      * Address todo: FetchChecker is generic
      
      * all tests passing
      690f52f5
    • Guanqun Lu's avatar
      add build status in README (#566) · 97dc8139
      Guanqun Lu authored
      97dc8139
    • Guanqun Lu's avatar
      send memory usage and cpu usage to telemetry (#499) · a63ed69f
      Guanqun Lu authored
      * send memory usage and cpu usage to telemetry
      
      Fixes #443, however, it doesn't send IO usage, as it's not available in
      this crate.
      
      * fixes according to Gav's comments
      
      * fix grumbles, send basictypes in telemetry
      a63ed69f
  14. Aug 14, 2018
    • shamardy's avatar
      Ensure total tokens in system is kept up to date (#428) · db089e21
      shamardy authored
      * Squashed commit of the following:
      
      commit 802b219d86a63f2a68a2f2fbc406229d192ce99f
      Author: shamardy <[email protected]>
      Date:   Tue Aug 14 19:13:52 2018 +0200
      
          Removed set_bad_validators function
      
      commit 53d17fc4c7798a5cf180bc8783213e0b50068ecc
      Merge: 671c53a6 354457d9
      Author: shamardy <[email protected]>
      Date:   Tue Aug 14 18:00:56 2018 +0200
      
          Merge branch 'master' into Issue#303
      
      commit 671c53a68f0357171d1bbbcd46f1ed7dd68755af
      Author: shamardy <[email protected]>
      Date:   Tue Aug 14 08:16:55 2018 +0200
      
          Updated test
      
      commit 6c7d8f455841cfe1902e700d230844b393a2aa16
      Author: shamardy <[email protected]>
      Date:   Tue Aug 14 08:14:07 2018 +0200
      
          Squashed commit of the following:
      
          commit f5a74b4804bc1a244d35f679c2a60cffe556ca3c
          Author: shamardy <[email protected]>
          Date:   Tue Aug 14 07:30:36 2018 +0200
      
              Update Tests
      
          commit 39724da56d1782e9d5303ea8764dfdf8d7f517ec
          Author: shamardy <[email protected]>
          Date:   Tue Aug 14 06:45:34 2018 +0200
      
              fix
      
          commit 9d564c707fe5d0e4de005ab55c63c136722e6591
          Author: shamardy <[email protected]>
          Date:   Tue Aug 14 06:36:50 2018 +0200
      
              fix
      
          commit 0c2bad1da22488ea8cae2a6119a374bf9b628596
          Author: shamardy <[email protected]>
          Date:   Tue Aug 14 05:53:35 2018 +0200
      
              fix
      
          commit f7069b3784579a2d20b6298d021b0d99d3f9beb6
          Author: shamardy <[email protected]>
          Date:   Tue Aug 14 00:34:10 2018 +0200
      
              Function to set bad validators
      
          commit 7c9bb146ba7adacde29a11e16b0194a29d0d77c8
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 23:35:46 2018 +0200
      
              fix
      
          commit 641eb4267031478d60e4e1476231629052d10549
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 23:00:08 2018 +0200
      
              Edit
      
          commit 5981f5fd5ee65dac9c3e19275ae4647cb173d798
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 22:25:56 2018 +0200
      
              Edit fix
      
          commit db3dd37c435ddc5dad0f9dde56cf7be539a0e1d0
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 21:39:57 2018 +0200
      
              fix
      
          commit bdb34c4f14fd68b3d307980da1182075bc74f156
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 21:11:08 2018 +0200
      
              Edit for early exit slashing tests by adding bad validators manually
      
          commit 8134bc6d13f9bf81050d37e8db39e819342af023
          Author: shamardy <[email protected]>
          Date:   Mon Aug 13 15:06:57 2018 +0200
      
              Update header root to match storage root in wasm test
      
          commit ee893f65a653c8826bb177bcf378d795bd1b9351
          Author: shamardy <[email protected]>
          Date:   Sun Aug 12 15:27:57 2018 +0200
      
              Update header root to match storage root in test
      
          commit eb1fb61b928ca13b4ab1b76301b577154858f425
          Author: shamardy <[email protected]>
          Date:   Sun Aug 12 14:07:40 2018 +0200
      
              Update tests
      
          commit f27559b3364ffe1255b01e7d3f09d87fe5d9c3a2
          Author: shamardy <[email protected]>
          Date:   Sun Aug 12 13:14:13 2018 +0200
      
              Squashed commit of the following:
      
              commit ac244e219f6e4c5f1b19463f33ce2edb3b66f6c3
              Author: shamardy <[email protected]>
              Date:   Sun Aug 12 12:55:25 2018 +0200
      
                  Edited Tests
      
              commit 93ac939024da55bb90479b3fcbaf82fc4407727f
              Author: shamardy <[email protected]>
              Date:   Sun Aug 12 12:08:47 2018 +0200
      
                  Squashed commit of the following:
      
                  commit 910ff83a3b0405546f0a7a1d8727e69ec22f2513
                  Author: shamardy <[email protected]>
                  Date:   Sun Aug 12 03:53:40 2018 +0200
      
                      Edited Test
      
                  commit 2758bc44007652fd05bab221df3f349fe7daeb6a
                  Author: shamardy <[email protected]>
                  Date:   Sun Aug 12 03:16:38 2018 +0200
      
                      Check that block 4 is the final block in session
      
                  commit 49f4043e0fb44118c833b3063f4820213d279bac
                  Author: shamardy <[email protected]>
                  Date:   Sun Aug 12 02:31:12 2018 +0200
      
                      LastLengthChange should change to block number when setting length
      
                  commit eb5873550810a25ca093a635405bb069a0610d10
                  Author: shamardy <[email protected]>
                  Date:   Sun Aug 12 00:17:22 2018 +0200
      
                      Squashed commit of the following:
      
                      commit 48fae25a49b0aa3294ab04651f0c2cb530994d9a
                      Author: shamardy <[email protected]>
                      Date:   Sat Aug 11 23:32:25 2018 +0200
      
                          Increase TotalStake by ReclaimRebate if NewAccountOutcome::GoodHint
      
                      commit d1166230ad3dcda00cc6916efe5d0d18007ecc4f
                      Author: shamardy <[email protected]>
                      Date:   Fri Aug 10 01:45:48 2018 +0200
      
                          Updating set_free_balance_creating
      
                      commit fbdabd802a618af5311d21c5ec7e4b25d50cd705
                      Author: shamardy <[email protected]>
                      Date:   Fri Aug 10 00:52:40 2018 +0200
      
                          fix for TotalStake tracking in transfer and set_free_balance_creating fn
      
                      commit f26bb1d6faeab3bb9a997ea0498009bc25dae244
                      Author: shamardy <[email protected]>
                      Date:   Fri Aug 10 00:03:17 2018 +0200
      
                          Fix if account created on an old account with more balance
      
                      commit f0952094de2b3ab8528fb42794d98504c647cc7a
                      Author: shamardy <[email protected]>
                      Date:   Thu Aug 9 22:32:48 2018 +0200
      
                          fix
      
                      commit 28260e570c3b81b79cb390d097a7a941f44dfc0a
                      Author: shamardy <[email protected]>
                      Date:   Thu Aug 9 21:36:27 2018 +0200
      
                          fix totalstake update in set_free_balance_creating fn if account exists
      
                      commit b72fd6fab556eb0ad653d805ee4c415cbf88561d
                      Author: shamardy <[email protected]>
                      Date:   Thu Aug 9 20:26:30 2018 +0200
      
                          TotalStake is updated in contract_transfer_max_depth function
      
                      commit 2fa1cc27dc75229b941eba686a33fa6906f7b1a8
                      Author: shamardy <[email protected]>
                      Date:   Thu Aug 9 20:22:17 2018 +0200
      
                          Squashed commit of the following:
      
                          commit 7fbf74c5e55038b006d6ac57621ed42c00fdd0e4
                          Author: shamardy <[email protected]>
                          Date:   Thu Aug 9 19:08:49 2018 +0200
      
                              fix for tests with set_free_balance calls
      
                          commit c6b4196f853191467d8a99c9604ba692425bbbaa
                          Author: shamardy <[email protected]>
                          Date:   Thu Aug 9 18:28:03 2018 +0200
      
                              Update TotalStake where set_free_balance is called
      
                          commit e827abc5184d48728168fbb57be6e8f03a8504e9
                          Author: shamardy <[email protected]>
                          Date:   Thu Aug 9 16:57:36 2018 +0200
      
                              Update TotalStake where set_reserved_balance is called
      
                          commit f73bec9c1a8376360b992e39333d762892ca8735
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 16:44:59 2018 +0200
      
                              fix
      
                          commit 5a498c5f4660429f7a24c09e715f7b083266c93d
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 15:47:03 2018 +0200
      
                              Test for full_native_block_import_works to check storage root
      
                          commit 024249ca52ae7ef0f5d39e99c585617a3db1dc0c
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 14:38:07 2018 +0200
      
                              Use <FreeBalance<Test>>::insert in this fn to avoid TotalStake Overflow
      
                          commit d602839cd59dd8550c87ec2c0bf103c806daedab
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 13:59:47 2018 +0200
      
                              Removed <TotalStake<Test>>::put from tests
      
                          commit 38586043912b40c9004bb5232cb7ca3c01ec9144
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 13:56:15 2018 +0200
      
                              Replace Balance::insert in tests to set balance fn to update TotalStake
      
                          commit 170ab6f8cd152adbc525bcc32fa012e3c11b6177
                          Merge: 9b0b22bd 2230b61c
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 12:32:05 2018 +0200
      
                              Merge branch 'Issue#303' of https://github.com/shamardy/polkadot into Issue#303
      
                          commit 9b0b22bd2084083f610e4870d5866bbd8e8d7229
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 12:31:45 2018 +0200
      
                              Edit
      
                          commit 2230b61c261296f6d09d0ec5353c0f207b281a67
                          Merge: 2fe9c528 18d4234b
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 11:12:19 2018 +0200
      
                              Merge branch 'master' into Issue#303
      
                          commit 2fe9c528bef62b0f43ef98c5166408d7d048f513
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 11:09:08 2018 +0200
      
                              commented out some tests
      
                          commit a6c2d8412e1d8e409d4fe2ca6545be5e525d80b0
                          Author: shamardy <[email protected]>
                          Date:   Fri Aug 3 10:35:17 2018 +0200
      
                              fix
      
                          commit ceb34d873b48ea7debd878a78f57ce235acd6ee8
                          Author: shamardy <[email protected]>
                          Date:   Thu Aug 2 16:52:16 2018 +0200
      
                              Update
      
                          commit a363120bd1b72597deb6ee945f9c51d32a851b14
                          Author: shamardy <[email protected]>
                          Date:   Thu Aug 2 16:05:40 2018 +0200
      
                              Edit
      
                          commit e45a92847a4beb28aa6f876ec109585467f4d732
                          Author: shamardy <[email protected]>
                          Date:   Wed Aug 1 16:49:40 2018 +0200
      
                              Edit
      
                          commit 07c5dcec22e43d6ccb49b42356590fb370bbcfae
                          Author: shamardy <[email protected]>
                          Date:   Tue Jul 31 15:44:40 2018 +0200
      
                              Instead of update_total_stake => 2 functions to increase and decrease
      
                          commit 7eb03b29e429a86d206244779d383af9437f208d
                          Author: shamardy <[email protected]>
                          Date:   Tue Jul 31 14:24:36 2018 +0200
      
                              Removed update_total_stake from set_free_balance_creating
      
                          commit 234ff798c6a7e035c7d3f7a9a668e311f9940dc5
                          Author: shamardy <[email protected]>
                          Date:   Tue Jul 31 14:22:48 2018 +0200
      
                              Squashed commit of the following:
      
                              commit 8f2e421a731f353394c611dc6e93ad48ba811a1a
                              Author: shamardy <[email protected]>
                              Date:   Tue Jul 31 13:24:30 2018 +0200
      
                                  added balances to trait Store
      
                              commit b64c3a99467895b042f6a30219caf87f8265fa90
                              Author: shamardy <[email protected]>
                              Date:   Tue Jul 31 12:52:16 2018 +0200
      
                                  update_total_stake iterates through balances
      
                              commit bf503ecc6b3664a6be7eac6adef3f83f72e4a8fa
                              Author: shamardy <[email protected]>
                              Date:   Tue Jul 31 11:06:25 2018 +0200
      
                                  Removed update_total_stake from inside transfer function for now to test
      
                              commit d91a8a666b5b52e1c77b72e3ae59040e71cd8d9c
                              Author: shamardy <[email protected]>
                              Date:   Mon Jul 30 21:26:09 2018 +0200
      
                                  update_total_stake function fix
      
                              commit 2465361fe9f631ae790d3f24ef69f9972b6adae5
                              Author: shamardy <[email protected]>
                              Date:   Mon Jul 30 21:10:02 2018 +0200
      
                                  fix
      
                              commit 2351f3532d6ba28491231bcb0717f8e76fc35629
                              Author: shamardy <[email protected]>
                              Date:   Mon Jul 30 19:36:21 2018 +0200
      
                                  fix
      
                              commit 7139371e5c07cc41112468e82d7ec901e8361d60
                              Author: shamardy <[email protected]>
                              Date:   Mon Jul 30 18:38:50 2018 +0200
      
                                  update
      
                              commit e6602d1f98190f35565d3c31e3b7a2d3df64607e
                              Author: shamardy <[email protected]>
                              Date:   Mon Jul 30 18:36:43 2018 +0200
      
                                  Squashed commit of the following:
      
                                  commit dcb597a60c960ff40623e98c6a1210f5df196794
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 18:31:49 2018 +0200
      
                                      update
      
                                  commit c41382eb135eda3bffa957e8887fcffd0388a745
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 18:23:59 2018 +0200
      
                                      Update
      
                                  commit f828c69e055489b69739b0ea082afa1ceca23b9c
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 18:12:18 2018 +0200
      
                                      Created function to update total stake
      
                                  commit e398a587edb7e57378bd61c9f9940aadfb94e82a
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 15:02:07 2018 +0200
      
                                      TotalStake tracks transfer fees + added test for account removal
      
                                  commit 0cfb26ce508578ce386bac5e02856cb6f298c6ba
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 14:21:06 2018 +0200
      
                                      TotalStake tracks accounts removal when free/reserved balance is too low
      
                                  commit 6054dcf171eddfbe58c4e01f2b32b6f576e3d9c7
                                  Merge: 5740c8fc 6fa9c949
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 14:16:37 2018 +0200
      
                                      Merge branch 'Issue#303' of https://github.com/shamardy/polkadot into Issue#303
      
                                  commit 5740c8fc09cdac9ec2228a66626b1c1ecb5dbeaf
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 14:15:41 2018 +0200
      
                                      Resolved merge conflict by incorporating both suggestions.
      
                                  commit 6fa9c949b9257bccb7ee48c32af35182a4dbf5f8
                                  Merge: 2b29fe85 9d7a3c1d
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 14:12:11 2018 +0200
      
                                      Merge branch 'master' into Issue#303
      
                                  commit 2b29fe85ff0802594ad203d430ec4653f980296d
                                  Author: shamardy <[email protected]>
                                  Date:   Mon Jul 30 13:48:48 2018 +0200
      
                                      Squashed commit of the following:
      
                                      commit 773cdb913f671f575cc2933b14f2e783f49ffd7e
                                      Author: shamardy <[email protected]>
                                      Date:   Mon Jul 30 13:13:21 2018 +0200
      
                                          Squashed commit of the following:
      
                                          commit 07dc1945c3b51438028494f7691343638d647a93
                                          Author: shamardy <[email protected]>
                                          Date:   Mon Jul 30 13:08:00 2018 +0200
      
                                              TotalStake tracks accounts removal when free/reserved balance is too low
      
                                          commit 1b04d3afab44c99751c389ac6cddd865c0f77015
                                          Author: shamardy <[email protected]>
                                          Date:   Thu Jul 26 21:29:35 2018 +0200
      
                                              Edited slashing reserved balance tests
      
                                          commit 52482d5ac5828e927afcd7f27010ef64c085353f
                                          Author: shamardy <[email protected]>
                                          Date:   Thu Jul 26 20:46:17 2018 +0200
      
                                              Edited some tests
      
                                          commit 7c98f96d2ea1952b241054581bc1430863e4aab4
                                          Author: shamardy <[email protected]>
                                          Date:   Thu Jul 26 20:11:54 2018 +0200
      
                                              TotalStake tracks slashing of reserved balance
      
                                          commit 1d9f942ede81281218c1b4f84201388cf0908a4e
                                          Author: shamardy <[email protected]>
                                          Date:   Thu Jul 26 18:43:36 2018 +0200
      
                                              Ensure total tokens in system is kept up to date
      
      * Fix Test
      db089e21