updates for staking + fix tests#20

jachai wants to merge 2 commits into

masterpropsproject/props-token-distribution:masterfrom

feature/upgrade-for-props-protocol-stakingpropsproject/props-token-distribution:feature/upgrade-for-props-protocol-stakingCopy head branch name to clipboard