update versions

.gitignore

@@ -42,7 +42,6 @@ coverage.json
 # node
 node_modules/
 npm-debug.log
-package-lock.json
 
 # other
 .vs/

config/blockchain.js

@@ -1,33 +1,14 @@
 module.exports = {
   default: {
     enabled: true,
-    rpcHost: "localhost", 
-    rpcPort: 8545, 
-    rpcCorsDomain: {
-      auto: true,
-      additionalCors: []
-    },
-    wsRPC: true,
-    wsOrigins: { 
-      auto: true,
-      additionalCors: []
-    },
-    wsHost: "localhost",
-    wsPort: 8546 
+    client: "geth"
   },
 
   development: {
-    ethereumClientName: "geth", 
-    networkType: "custom", 
-    networkId: 1337,
-    isDev: true,
-    datadir: ".embark/development/datadir",
-    mineWhenNeeded: true, 
-    nodiscover: true, 
-    maxpeers: 0, 
-    proxy: true, 
-    targetGasLimit: 8000000, 
-    simulatorBlocktime: 0
+    client: 'ganache-cli',
+    clientConfig: {
+      miningMode: 'dev'
+    }
   },
 
   testnet: {

config/contracts.js

@@ -1,18 +1,13 @@
 module.exports = {
   default: {
-    deployment: {
-      host: "localhost", 
-      port: 8546,
-      type: "ws"
-    },
     dappConnection: [
       "$WEB3", 
       "ws://localhost:8546",
       "http://localhost:8545"
     ],
     gas: "auto",
     strategy: "explicit",
-    contracts: {          
+    deploy: {          
       MiniMeTokenFactory: {
         deploy: true
       },

contracts/common/Controlled.sol

@@ -1,6 +1,7 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
-contract Controlled {
+abstract contract Controlled {
     /// @notice The address of the controller is the only address that can call
     ///  a function with this modifier
     modifier onlyController { 
@@ -10,7 +11,7 @@ contract Controlled {
 
     address payable public controller;
 
-    constructor() internal { 
+    constructor() { 
         controller = msg.sender; 
     }
 

contracts/common/MerkleProof.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 
 /**

contracts/common/MessageSigned.sol

@@ -1,12 +1,11 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 /** 
  * @notice Uses ethereum signed messages
  */
-contract MessageSigned {
+abstract contract MessageSigned {
 
-    constructor() internal {}
-
     /**
      * @notice recovers address who signed the message
      * @param _signHash operation ethereum signed message hash

contracts/common/Owned.sol

@@ -1,8 +1,9 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 /// @dev `Owned` is a base level contract that assigns an `owner` that can be
 ///  later changed
-contract Owned {
+abstract contract Owned {
 
     /// @dev `owner` is the only address that can call a function with this
     /// modifier
@@ -14,7 +15,7 @@ contract Owned {
     address payable public owner;
 
     /// @notice The Constructor assigns the message sender to be `owner`
-    constructor() internal {
+    constructor() {
         owner = msg.sender;
     }
 

contracts/common/SafeMath.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * Math operations with safety checks

contracts/democracy/Democracy.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../token/MiniMeToken.sol";
 import "./delegation/DelegationFactory.sol";
@@ -19,7 +20,6 @@ contract Democracy {
         uint256 startBlockDelay;
         uint256 votingBlockDelay;
         uint256 tabulationBlockDelay;
-        mapping (address => mapping (bytes4 => bool)) allowance;
     }
 
     struct ProposalData {
@@ -30,6 +30,8 @@ contract Democracy {
         address destination;
         bytes data;
     }
+
+    mapping (bytes32 => mapping (bytes4 => bool)) allowance;
 
     MiniMeToken public token;
     DelegationFactory public delegationFactory;
@@ -53,9 +55,7 @@ contract Democracy {
         uint256 startBlockDelay,
         uint256 votingBlockDelay,
         uint256 tabulationBlockDelay
-    ) 
-        public 
-    {
+    ) {
         token = _token;
         delegationFactory = _delegationFactory;
 
@@ -201,9 +201,8 @@ contract Democracy {
     ) private {
         uint256 len = allowedDests.length;
         require(len == allowedSigs.length);
-        Topic storage topic = topics[topicId];
         for(uint i = 0; i > len; i++) {
-            topic.allowance[allowedDests[i]][allowedSigs[i]] = true;
+            allowance[keccak256(abi.encodePacked(topicId,allowedDests[i]))][allowedSigs[i]] = true;
         }
     }
 
@@ -223,7 +222,7 @@ contract Democracy {
         require(len == _allowed.length);
         require(address(topics[_topicId].approveDelegation) != address(0), "Invalid topic");
         for(uint i = 0; i > len; i++) {
-            topics[_topicId].allowance[allowedDests[i]][allowedSigs[i]] = _allowed[i];
+            allowance[keccak256(abi.encodePacked(_topicId,allowedDests[i]))][allowedSigs[i]] = _allowed[i];
         }
     }
 
@@ -255,10 +254,10 @@ contract Democracy {
             calledSig := mload(add(data, 4))
         }
 
-        return topics[topic].allowance[destination][bytes4(0)]
-            || topics[topic].allowance[destination][calledSig]
-            || topics[topic].allowance[address(0)][bytes4(0)]
-            || topics[topic].allowance[address(0)][calledSig];
+        return allowance[keccak256(abi.encodePacked(topic,destination))][bytes4(0)]
+            || allowance[keccak256(abi.encodePacked(topic,destination))][calledSig]
+            || allowance[keccak256(abi.encodePacked(topic,address(0)))][bytes4(0)]
+            || allowance[keccak256(abi.encodePacked(topic,address(0)))][calledSig];
 
     }
 }

contracts/democracy/delegation/Delegation.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH)  

contracts/democracy/delegation/DelegationAbstract.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../deploy/InstanceAbstract.sol";
 import "../../common/Controlled.sol";
@@ -8,7 +9,7 @@ import "./Delegation.sol";
  * @title DelegationAbstract
  * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH). 
  */
-contract DelegationAbstract is InstanceAbstract, Controlled, Delegation {
+abstract contract DelegationAbstract is InstanceAbstract, Controlled, Delegation {
     struct DelegateSet {
         uint96 fromBlock; //when this was updated
         address to; //who recieved this delegaton
@@ -20,7 +21,7 @@ contract DelegationAbstract is InstanceAbstract, Controlled, Delegation {
     mapping (address => DelegateSet[]) public delegations;
 
 
-    constructor() internal {
+    constructor() {
 
     }
 
@@ -47,7 +48,7 @@ contract DelegationAbstract is InstanceAbstract, Controlled, Delegation {
       * @dev `_getDelegationAt` retrieves the delegation at a given block number.
       * @param checkpoints The memory being queried.
       * @param _block The block number to retrieve the value at.
-      * @return The delegation being queried.
+      * @return d The delegation being queried.
       */
     function getMemoryAt(DelegateSet[] storage checkpoints, uint _block) internal view returns (DelegateSet memory d) {
         // Case last checkpoint is the one;
@@ -74,7 +75,7 @@ contract DelegationAbstract is InstanceAbstract, Controlled, Delegation {
      *         or from parent level if `_who` never defined/defined to parent address.
      * @param _who What address to lookup.
      * @param _block Block number of what height in history.
-     * @return The address `_who` choosen delegate to.
+     * @return directDelegate address `_who` choosen delegate to.
      */
     function findDelegatedToAt(
         address _who,

contracts/democracy/delegation/DelegationBase.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./DelegationAbstract.sol";
 
@@ -12,7 +13,7 @@ contract DelegationBase is DelegationAbstract {
     /**
      * @notice Calls Constructor
      */
-    constructor(Delegation _parentDelegation) public {
+    constructor(Delegation _parentDelegation) {
         parentDelegation = _parentDelegation;
     }
 
@@ -22,7 +23,7 @@ contract DelegationBase is DelegationAbstract {
      *         If once defined and want to delegate to parent proxy, set `_to` as parent address. 
      * @param _to To what address the caller address will delegate to.
      */
-    function delegate(address _to) external {
+    function delegate(address _to) override external {
         updateDelegate(msg.sender, _to);
     }
 
@@ -43,6 +44,7 @@ contract DelegationBase is DelegationAbstract {
      * @return The address `_who` choosen delegate to.
      */
     function delegatedTo(address _who)
+        override
         external
         view 
         returns (address) 
@@ -55,12 +57,13 @@ contract DelegationBase is DelegationAbstract {
      *         or from parent level if `_who` never defined/defined to parent address.
      * @param _who What address to lookup.
      * @param _block Block number of what height in history.
-     * @return The address `_who` choosen delegate to.
+     * @return directDelegate The address `_who` choosen delegate to.
      */
     function delegatedToAt(
         address _who,
         uint _block
     )
+        override
         external
         view
         returns (address directDelegate)

contracts/democracy/delegation/DelegationFactory.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "../../deploy/InstanceFactory.sol";
 import "../../deploy/Instance.sol";
@@ -13,7 +14,6 @@ contract DelegationFactory is InstanceFactory {
 
     constructor(DelegationAbstract _base, DelegationAbstract _init, DelegationAbstract _emergency) 
         InstanceFactory(_base, _init, _emergency)
-        public
     { }
 
     function createDelegation(

contracts/democracy/delegation/DelegationInit.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./DelegationAbstract.sol";
 
@@ -22,7 +23,7 @@ contract DelegationInit is DelegationAbstract {
     /**
      * @notice Constructor of the model
      */
-    constructor() public {
+    constructor() {
         parentDelegation = Delegation(address(-1)); //avoids calling create delegation within the Init contract.
     }
 
@@ -47,8 +48,8 @@ contract DelegationInit is DelegationAbstract {
         updateDelegate(address(0), _defaultDelegate);
     }
 
-    function delegate(address) external notImplemented {}
-    function delegatedTo(address) external view notImplemented returns (address) {}  
-    function delegatedToAt(address,uint) external view notImplemented returns (address) {}
+    function delegate(address) override external notImplemented {}
+    function delegatedTo(address) override external view notImplemented returns (address) {}  
+    function delegatedToAt(address,uint) override external view notImplemented returns (address) {}
 
 }

contracts/democracy/delegation/DelegationReader.sol

@@ -1,14 +1,16 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 import "./Delegation.sol";
 
-contract DelegationReader {
+abstract contract DelegationReader {
     Delegation delegation;
     mapping(address => address) delegationOf;
 
     function validDelegate(
         address _who
-    )        
+    )
+        virtual
         internal
         view
         returns(bool);

contracts/democracy/proposal/Proposal.sol

@@ -1,4 +1,5 @@
-pragma solidity >=0.5.0 <0.6.0;
+// SPDX-License-Identifier: CC0-1.0
+pragma solidity >=0.6.0 <0.8.0;
 
 /**
  * @title Proposal