New Proxy and Token

IMVDProxy.sol

@@ -20,6 +20,7 @@ interface IMVDProxy {
     function disableProposal(address proposalAddress) external;
     function transfer(address receiver, uint256 value, address token) external;
     function transfer721(address receiver, uint256 tokenId, bytes calldata data, bool safe, address token) external;
+    function flushToWallet(address tokenAddress, bool is721, uint256 tokenId) external;
     function setProposal() external;
     function read(string calldata codeName, bytes calldata data) external view returns(bytes memory returnData);
     function submit(string calldata codeName, bytes calldata data) external payable returns(bytes memory returnData);

MVDProxy.sol

@@ -8,6 +8,7 @@ import "./IMVDFunctionalityModelsManager.sol";
 import "./ICommonUtilities.sol";
 import "./IMVDFunctionalitiesManager.sol";
 import "./IMVDWallet.sol";
+import "./IERC721.sol";
 
 contract MVDProxy is IMVDProxy {
 
@@ -71,6 +72,20 @@ contract MVDProxy is IMVDProxy {
         return _delegates[5];
     }
 
+    function flushToWallet(address tokenAddress, bool is721, uint256 tokenId) public override {
+        require(IMVDFunctionalitiesManager(_delegates[4]).isAuthorizedFunctionality(msg.sender), "Unauthorized action!");
+        if(tokenAddress == address(0)) {
+            payable(_delegates[5]).transfer(payable(address(this)).balance);
+            return;
+        }
+        if(is721) {
+            IERC721(tokenAddress).transferFrom(address(this), _delegates[5], tokenId);
+            return;
+        }
+        IERC20 token = IERC20(tokenAddress);
+        token.transfer(_delegates[5], token.balanceOf(address(this)));
+    }
+
     function setDelegate(uint256 position, address newAddress) public override returns(address oldAddress) {
         require(IMVDFunctionalitiesManager(_delegates[4]).isAuthorizedFunctionality(msg.sender), "Unauthorized action!");
         require(newAddress != address(0), "Cannot set void address!");

VotingToken.sol

@@ -3,6 +3,8 @@ pragma solidity ^0.6.0;
 import "./IMVDProxy.sol";
 import "./IERC20.sol";
 import "./IVotingToken.sol";
+import "./IMVDFunctionalityProposalManager.sol";
+import "./IMVDFunctionalitiesManager.sol";
 
 contract VotingToken is IERC20, IVotingToken {
 
@@ -63,28 +65,23 @@ contract VotingToken is IERC20, IVotingToken {
     }
 
     function transfer(address recipient, uint256 amount) public override returns (bool) {
-        require(_proxy == address(0) ? true : !IMVDProxy(_proxy).isValidProposal(recipient), "Cannot transfer to DFC Survey Proposal!");
         _transfer(msg.sender, recipient, amount);
         return true;
     }
 
     function allowance(address owner, address spender) public override view returns (uint256) {
-        if(IMVDProxy(_proxy).isValidProposal(spender)) {
-            return _balances[owner];
-        }
         return _allowances[owner][spender];
     }
 
     function approve(address spender, uint256 amount) public override returns (bool) {
-        require(!IMVDProxy(_proxy).isValidProposal(spender), "Cannot approve Proposals to spend tokens");
         _approve(msg.sender, spender, amount);
         return true;
     }
 
     function transferFrom(address sender, address recipient, uint256 amount) public override returns (bool) {
         _transfer(sender, recipient, amount);
         address txSender = msg.sender;
-        if(!(IMVDProxy(_proxy).isValidProposal(txSender) && recipient == txSender)) {
+        if(_proxy == address(0) || !(IMVDFunctionalityProposalManager(IMVDProxy(_proxy).getMVDFunctionalityProposalManagerAddress()).isValidProposal(txSender) && recipient == txSender)) {
             _approve(sender, txSender, _allowances[sender][txSender] = sub(_allowances[sender][txSender], amount, "ERC20: transfer amount exceeds allowance"));
         }
         return true;
@@ -134,7 +131,7 @@ contract VotingToken is IERC20, IVotingToken {
     }
 
     function mint(uint256 amount) public override {
-        require(IMVDProxy(_proxy).isAuthorizedFunctionality(msg.sender), "Unauthorized access!");
+        require(IMVDFunctionalitiesManager(IMVDProxy(_proxy).getMVDFunctionalitiesManagerAddress()).isAuthorizedFunctionality(msg.sender), "Unauthorized access!");
 
         _totalSupply = add(_totalSupply, amount);
         _balances[_proxy] = add(_balances[_proxy], amount);