thetta / thetta-dao-framework Goto Github PK

Code is here

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/moneyflow/Schemes.sol

Implement all TODOs:

1. setSalaryForEmployee
2. setBonusForEmployee
3. setOtherSpend

Tests should be here:

https://github.com/Thetta/SmartContracts/blob/dev2/test/moneyflow_scheme_test.js

1. Test each method separately (setSalaryForEmployee, setBonusForEmployee, setOtherSpend)

2. Each method should be called:
   a) directly
   b) with vote

3. Instantiate DefaultMoneyflowScheme and add items just like in the scheme that was manually created here - https://github.com/Thetta/SmartContracts/blob/dev2/test/moneyflow_tests.js#L24
   a) add 3 tasks
   b) add 3 employees
   c) add 3 bonuses

Should allow many persons act as one

Maybe use

https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/contracts/token/ERC20/TokenTimelock.sol

?

DelegationTable and LiquidVoting

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/governance/LiquidDemocracy.sol

IDelegationTable

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/governance/IVoting.sol#L24

Example:
https://gist.github.com/AnthonyAkentiev/87115598b572693daf0b2abd6471a0af

upgradeMicrocompanyContract() can require voting!
Put "easy to use" code into AutoActionCaller.
See the example with issueTokensAuto.

Add test here - https://github.com/Thetta/SmartContracts/blob/dev2/test/genericcaller_tests.js

Currently

Moneyflow send ETH to each item in the heirarchy (splitters). This eats a lot of gas

Improvement

1. Calculate the current gas usage for the typical moneyflow hierarchy
2. Make some "getTargets()" method that will return a mapping of address => uint to send ALL money directly just from the 1 source!

This will greately reduce gas cost!

1. contracts/moneyflow/WeiExpense.sol
2. test/moneyflow_tests.js

These contracts have a lot of common code.
Refactor it -> move common code to base contract

Think about: How to protect us from the looping?
i.e. when i do A -> B -> A moneyflow scheme!

1. Do not overwrite files! Merge instead (if needed)
2. Do not move app and application folders

Gate is closed if period not elapsed.

Behaviour:

1. Gate can be always open (period==0);
2. Is "one time" only

???? DO NOT IMPLEMENT now:

3. Is "calculate debt"?

Think about that and implement

See this article - https://medium.com/rocket-pool/upgradable-solidity-contract-design-54789205276d

Zeppelin Proxy approach (delegatecall) is here - https://blog.zeppelinos.org/announcing-zeppelin_os-labs/#more-237

See upgrades here:
https://0xproject.com/wiki#Architecture

Code is very redundant and is very similar:

contract AutoMoneyflowActionCaller {
	IMicrocompanyBase mc;
	IMoneyflowScheme mfs;

	function AutoMoneyflowActionCaller(IMicrocompanyBase _mc, IMoneyflowScheme _mfs){
		mc = _mc;
		mfs = _mfs;
	}

	function addNewTask(WeiAbsoluteExpense wt) public returns(address voteOut){
		if(mc.isCanDoAction(msg.sender, "addNewTask")){
			// 1 - add new task immediately
			mfs.addNewTask(wt);
			return 0x0;
		}else{
			ProposalAddNewTask vant = new ProposalAddNewTask(mc, mfs, msg.sender, wt);

			// WARNING: should be permitted to add new proposal by the current contract address!!!
			mc.addNewProposal(vant);
			return vant;
		}
	}
}

Goals:

1. make it generic
2. Voting type should be parametrized

Method is here

https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/contracts/moneyflow/Schemes.sol#L82

Auto-wrapper is located here

https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/contracts/moneyflow/AutoMoneyflowCaller.sol

Tests are located here

https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/test/moneyflow_scheme_test.js

TODO Tests:

1. Call 'setRootWeiReceiver directly
2. Call setRootWeiReceiverAuto that will NOT create new voting. I.e. it will call addNewTask as a result
3. Call setRootWeiReceiverAuto that will CREATE new voting.

Examples

Example of #2 test is here - https://github.com/Thetta/Thetta-DAO-Framework/blob/master/test/genericcaller_tests.js#L311

Example of #3 test is here - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/test/genericcaller_tests.js#L77

Use solidity-coverage npm package

From Vladimir:

.solcover поправил чтобы работал solodity-cover

В .solcover в skipFiles 3 файла, они пустые, npm run coverage ругается если есть пустые solidity файлы

В данный момент npm run coverage работает только если сначала запустить npm run test, npm run test после прогона всех тестов в корень проекта записывает файл allFiredEvents.json, так вот этот файл нужен для npm run coverage

WeiTask code is here

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/tasks/Tasks.sol

WeiTask tests are here

https://github.com/Thetta/SmartContracts/blob/dev2/test/task_tests.js

Moneyflow tests are here

https://github.com/Thetta/SmartContracts/blob/dev2/test/moneyflow_tests.js

TODO

Add 1-2 tasks to moneyflow scheme and test it

Example - https://github.com/airalab/robonomics_contracts/blob/master/airalab-foundation/contracts/Crowdfunding.sol

First idea (issue tokens, then transfer them at purchase)

1. Client creates new contract with params
2. Client deposits there tokens
3. ICO is started
4. Ether is collected, tokens are transferred
5. ICO is finished

Second idea (issue token at purchase)

1. Client creates new "ICO" contract with params
2. "ICO" contract has permission to issue tokens
3. ICO is started
4. Ether is collected, tokens are issues
5. ICO is finished

1. contracts//moneyflow/WeiExpense.sol
2. test/moneyflow_tests.js

Code is here - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/contracts/governance/Voting.sol

Tests are here - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/test/governance_tests.js

ethereum/EIPs#792

solium --dir ./contracts

1. setRootWeiReceiver https://github.com/Thetta/SmartContracts/blob/dev2/contracts/moneyflow/Moneyflow.sol#L55

2. withdrawDonationsTo https://github.com/Thetta/SmartContracts/blob/dev2/contracts/moneyflow/Moneyflow.sol#L29

Do not forget to write tests:

1. We have test for DIRECT calls here - https://github.com/Thetta/SmartContracts/blob/dev2/test/moneyflow_tests.js#L310
2. We DON'T HAVE tests for voting calls

https://github.com/Thetta/SmartContracts/blob/dev2/test/task_tests.js

Description:
https://docs.google.com/document/d/15UOnXM_iPudD95m-UYBcYns-SeqM2ksDecjYhZrqybQ/edit?usp=sharing

BRANCH is dev2

Stubs are here:
https://github.com/Thetta/SmartContracts/blob/dev2/test/moneyflow_tests.js#L53

I am not sure if logics is correct!
Need all scenarios to be tested (SPLITTERS!!!)

How it works now?

Currently WeiAbsoluteExpenseWithPeriod, WeiRelativeExpenseWithPeriod contract ask for X wei in Y days. If 5 * Y days elapsed -> it will still require only X wei.

Should be working like this:

Should have option "isCalculateDebt"
If 5* Y days elapsed -> isNeededWei() should be 5 * X;

If 5 * Y days elapsed, but only 3 * X money was received (and PULLED!) -> isNeededWei() should be 2 * X

Current approach requires
uint _currentFlow
to be passed -

See
https://docs.google.com/document/d/15UOnXM_iPudD95m-UYBcYns-SeqM2ksDecjYhZrqybQ/edit?usp=sharing

It would be great if we test another appoach without the 'currentFlow' variable

1. How to "fork" the corporation
2. How to select new "owner" (by leasing gov. tokens?)

Congress -

https://github.com/airalab/robonomics_contracts/blob/master/airalab-foundation/contracts/Congress.sol

Association

https://github.com/airalab/robonomics_contracts/blob/4117745a2f3efbb546c5d51c39e43a5b4266a7b4/contracts/dao/Association.sol

Permissions v.1 (now)

1. Address whitelist
2. Employee check
3. Voting with
4. Denied

Proposal v.1.2 (add different tokens)

1. Address whitelist
2. Employee check
3. Voting with
4. Denied

Proposal v.1.3 (add ACL groups)

1. Address whitelist
2. ACL group check
3. Voting with
4. Denied

// TODO: if Microcompany is upgraded -> mc will stop working

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/moneyflow/Moneyflow.sol#L10
https://github.com/Thetta/SmartContracts/blob/dev2/contracts/moneyflow/Schemes.sol#L25

test/bounty_tests.js file

Code is here - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/contracts/governance/Voting.sol

Tests are here - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/test/governance_tests.js

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/tasks/Tasks.sol#L32

Code is here - https://github.com/Thetta/SmartContracts/blob/dev2/contracts/tasks/Tasks.sol
BRANCH is dev2

4 types of tasks

1. PrePaid
2. PostPaid with known neededWei amount
3. PostPaid with unknown neededWei amount. Task is evaluated AFTER work is complete
4. PostPaid donation - client pays any amount he wants AFTER work is complete

1. Add balance checks

// TODO: check employee1 balance

1. add notifyObserversOnUpgrade() checking

function notifyObserversOnUpgrade(IMicrocompanyBase _new)public onlyOwner {
  for(uint i=0; i<observers.length; ++i){
    IMicrocompanyObserver(observers[i]).onUpgrade(_new);
  }
}

0. "Gates.sol" -> "Gate.sol"
1. "Children" -> "child"
2. Remove isCanDo. Use onlyOwner
3. Should inherit from IWeiReceiver
4. "closeIt" -> "close"
5. address children = 0x0; -> IWeiReceiver child;
6. Add balance checking to the test - https://github.com/Thetta/Thetta-DAO-Framework/blob/dev2/test/moneyflow_tests.js#L728

https://github.com/Thetta/SmartContracts/blob/dev2/contracts/tasks/Tasks.sol#L169

Make a separate ERC20-tokens moneyflow

Code is here:

https://github.com/Thetta/SmartContracts/blob/dev2/test/microcompany_tests.js#L193