@reality.eth/contracts 3.0.1 → 3.0.4

package/development/contracts/SplitterWallet.sol

@@ -1,142 +0,0 @@
-pragma solidity ^0.4.25;
-
-import './Owned.sol';
-import './RealitioSafeMath256.sol';
-
-/*
-This contract allows you to split ETH between up to 100 receivers.
-
-Each receiver can withdraw their own share of the funds without the cooperation of the others. 
-They can also replace their own address with a different one.
-
-The receivers can be added by the `owner` contract, for example a multisig wallet. 
-The same receiver can be added multiple times if you want an unequal distribution.
-Transfer ownership to 0x0 if you want to lock the receiver list and prevent further changes.
-
-This contract receives ETH normally, without using extra gas that could cause incoming payments to fail.
-Anyone can then call allocate() to assign any unassigned balance to the receivers.
-The `allocate()` call may leave a small amount of ETH unassigned due to rounding. This can be allocated in a future call.
-
-Once funds are allocated, each party can withdraw their own funds by calling `withdraw()`.
-*/
-
-contract SplitterWallet is Owned {
-
-    // We sometimes loop over our recipient list, so set a maximum to avoid gas exhaustion
-    uint256 constant MAX_RECIPIENTS = 100;
-
-    using RealitioSafeMath256 for uint256;
-
-    mapping(address => uint256) public balanceOf;
-    
-    // Sum of all balances in balanceOf
-    uint256 public balanceTotal; 
-
-    // List of recipients. May contain duplicates to get paid twice.
-    address[] public recipients;
-
-    event LogWithdraw(
-        address indexed user,
-        uint256 amount
-    );
-
-    function _firstRecipientIndex(address addr) 
-        internal
-    view returns (uint256) 
-    {
-        uint256 i;
-        for(i=0; i<recipients.length; i++) {
-            if (recipients[i] == addr) {
-                return i;
-            }
-        }
-        revert("Recipient not found");
-    }
-
-    /// @notice Add a recipient to the list
-    /// @param addr The address to add
-    /// @dev Doesn't check for duplicates, it's OK to add the same recipient twice for an unequal distribution
-    function addRecipient(address addr) 
-        onlyOwner
-    external {
-        require(recipients.length < MAX_RECIPIENTS, "Too many recipients");
-        recipients.push(addr);
-    }
-
-    /// @notice Remove a recipient from the list
-    /// @param old_addr The address to remove
-    /// @dev If your address shows up more than once, removes the first occurance
-    function removeRecipient(address old_addr) 
-        onlyOwner
-    external {
-
-        uint256 idx = _firstRecipientIndex(old_addr);
-        assert(recipients[idx] == old_addr);
-
-        // If you're not deleting the last item, copy the last item over to the thing you're deleting
-        uint256 last_idx = recipients.length - 1;
-        if (idx != last_idx) {
-            recipients[idx] = recipients[last_idx];
-        }
-
-        recipients.length--;
-    }
-
-    /// @notice Replace your own address with a different one
-    /// @param new_addr The new address
-    /// @dev If your address shows up more than once, replaces the first occurance
-    function replaceSelf(address new_addr) 
-    external {
-        uint256 idx = _firstRecipientIndex(msg.sender);
-        assert(recipients[idx] == msg.sender);
-        recipients[idx] = new_addr;
-    }
-
-    /// @notice Allocate any unallocated funds from the contract balance
-    /// @dev Any time the contract gets funds, they will appear as unallocated
-    /// @dev Assign them to the current recipients, and mark them as allocated
-    function allocate()
-    external {
-
-        uint256 unallocated = address(this).balance.sub(balanceTotal);
-        require(unallocated > 0, "No funds to allocate");
-
-        uint256 num_recipients = recipients.length;
-
-        // NB Rounding may leave some funds unallocated, we can claim them later
-        uint256 each = unallocated / num_recipients;
-        require(each > 0, "No money left to be allocated after rounding down");
-
-        uint256 i;
-        for (i=0; i<num_recipients; i++) {
-            address recip = recipients[i];
-            balanceOf[recip] = balanceOf[recip].add(each);
-            balanceTotal = balanceTotal.add(each);
-        }
-
-        assert(address(this).balance >= balanceTotal);
-
-    }
-
-    /// @notice Withdraw the address balance to the owner account
-    function withdraw() 
-    external {
-
-        uint256 bal = balanceOf[msg.sender];
-        require(bal > 0, "Balance must be positive");
-
-        balanceTotal = balanceTotal.sub(bal);
-        balanceOf[msg.sender] = 0;
-        msg.sender.transfer(bal);
-
-        emit LogWithdraw(msg.sender, bal);
-
-        assert(address(this).balance >= balanceTotal);
-
-    }
-
-    function()
-    external payable {
-    }
-
-}

package/tests/python/test_wallet.py

@@ -1,185 +0,0 @@
-import unittest
-from unittest import TestCase, main
-from rlp.utils import encode_hex, decode_hex
-from ethereum.tools import tester as t
-from ethereum.tools.tester import TransactionFailed
-from ethereum.tools import keys
-import time
-from sha3 import keccak_256
-from hashlib import sha256
-from web3 import Web3
-
-import os
-
-# Command-line flag to skip tests we're not working on
-WORKING_ONLY = os.environ.get('WORKING_ONLY', False)
-
-DEPLOY_GAS = 4500000
-
-class TestSplitter(TestCase):
-
-    def setUp(self):
-
-        self.c = t.Chain()
-
-        self.splitter_code = open('SplitterWallet.sol').read()
-        # Not sure what the right way is to get pyethereum to import the dependencies
-        # Pretty sure it's not this, but it does the job:
-        safemath_code_raw = open('RealitioSafeMath256.sol').read()
-        owned_code_raw = open('Owned.sol').read()
-
-        self.splitter_code = self.splitter_code.replace("import './Owned.sol';", owned_code_raw);
-        self.splitter_code = self.splitter_code.replace("import './RealitioSafeMath256.sol';", safemath_code_raw);
-
-        self.c.mine()
-        self.wallet0= self.c.contract(self.splitter_code, language='solidity', sender=t.k0, startgas=DEPLOY_GAS)
-        self.c.mine()
-
-    @unittest.skipIf(WORKING_ONLY, "Not under construction")
-    def test_recipient_limits(self):
-        
-        for i in range(100):
-            self.wallet0.addRecipient(t.a1, startgas=80000)
-            if i % 30 == 0:
-                self.c.mine()
-
-        self.c.mine()
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.addRecipient(t.a1, startgas=80000)
-
-        self.wallet0.removeRecipient(t.a1, startgas=80000)
-        self.wallet0.addRecipient(t.a1, startgas=80000)
-
-    @unittest.skipIf(WORKING_ONLY, "Not under construction")
-    def test_gas_worst_case(self):
- 
-        for i in range(100):
-            self.wallet0.addRecipient(i+1, startgas=80000)
-            if i % 30 == 0:
-                self.c.mine()
-
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-        self.c.tx(t.k0, self.wallet0.address, 100000)
-        self.c.mine()
-        self.wallet0.allocate(startgas=3000000)
-        self.c.mine()
-        self.assertEqual(self.wallet0.balanceTotal(), 100000)
-
-    @unittest.skipIf(WORKING_ONLY, "Not under construction")
-    def test_recipient_permissions(self):
-        
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.addRecipient(t.a1, startgas=80000, sender=t.k2)
-
-        self.wallet0.addRecipient(t.a1, startgas=80000, sender=t.k0)
-        self.wallet0.addRecipient(t.a2, startgas=80000, sender=t.k0)
-
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.replaceSelf(t.a2, startgas=80000, sender=t.k0)
-
-        self.wallet0.replaceSelf(t.a2, startgas=80000, sender=t.k2)
-
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.removeRecipient(t.a2, startgas=80000, sender=t.k2)
-
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.transferOwnership(t.a2, startgas=80000, sender=t.k2)
-
-        self.wallet0.transferOwnership(t.a2, startgas=80000, sender=t.k0)
-
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.removeRecipient(t.a2, startgas=80000, sender=t.k1)
-
-        self.wallet0.removeRecipient(t.a2, startgas=80000, sender=t.k2)
-
-    @unittest.skipIf(WORKING_ONLY, "Not under construction")
-    def test_split(self):
-
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 0)
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-        self.c.tx(t.k0, self.wallet0.address, 100000)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 100000)
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 0)
-
-        self.wallet0.addRecipient(t.a1)
-        self.wallet0.allocate()
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 100000)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 100000)
-
-        self.wallet0.withdraw(sender=t.k1)
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 0)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 0)
-
-        with self.assertRaises(TransactionFailed):
-            self.wallet0.withdraw(sender=t.k1)
-        self.c.mine()
-
-        self.wallet0.addRecipient(t.a2)
-
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-        self.c.tx(t.k0, self.wallet0.address, 100000)
-        self.c.tx(t.k0, self.wallet0.address, 50000)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 150000)
-        self.wallet0.allocate()
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 150000)
-        self.assertEqual(self.wallet0.balanceTotal(), 150000)
-
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 75000)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 75000)
-
-        self.wallet0.withdraw(sender=t.k1)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 75000)
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 0)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 75000)
-        self.assertEqual(self.wallet0.balanceTotal(), 75000)
-        self.wallet0.withdraw(sender=t.k2)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 0)
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-
-        self.c.tx(t.k0, self.wallet0.address, 3)
-        self.wallet0.allocate()
-        self.assertEqual(self.wallet0.balanceTotal(), 2)
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 1)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 1)
-        self.wallet0.withdraw(sender=t.k1)
-        self.wallet0.withdraw(sender=t.k2)
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 1)
-        self.c.tx(t.k0, self.wallet0.address, 5)
-        self.wallet0.allocate()
-        self.assertEqual(self.wallet0.balanceTotal(), 6)
-        self.assertEqual(self.wallet0.balanceOf(t.a1), 3)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 3)
-        self.wallet0.withdraw(sender=t.k1)
-        self.wallet0.withdraw(sender=t.k2)
-        self.assertEqual(self.wallet0.balanceTotal(), 0)
-        self.assertEqual(self.c.head_state.get_balance(self.wallet0.address), 0)
-
-    @unittest.skipIf(WORKING_ONLY, "Not under construction")
-    def test_duplicate_recipients(self):
-
-        self.wallet0.addRecipient(t.a1)
-        self.wallet0.addRecipient(t.a2)
-        self.wallet0.addRecipient(t.a2)
-
-        self.assertEqual(self.wallet0.recipients(1), self.wallet0.recipients(2))
-        self.assertNotEqual(self.wallet0.recipients(0), self.wallet0.recipients(1))
-
-        self.wallet0.replaceSelf(t.a3, sender=t.k2)
-        # a1 a3 a2
-
-        self.wallet0.replaceSelf(t.a2, sender=t.k1)
-        # a2 a3 a2
-
-        self.assertEqual(self.wallet0.recipients(0), self.wallet0.recipients(2))
-        self.assertNotEqual(self.wallet0.recipients(0), self.wallet0.recipients(1))
-        self.assertNotEqual(self.wallet0.recipients(1), self.wallet0.recipients(2))
-
-        self.c.tx(t.k0, self.wallet0.address, 100)
-        self.wallet0.allocate(sender=t.k4)
-        self.assertEqual(self.wallet0.balanceOf(t.a3), 33)
-        self.assertEqual(self.wallet0.balanceOf(t.a2), 66)
-        self.assertEqual(self.wallet0.balanceTotal(), 99)
-
-if __name__ == '__main__':
-    main()