Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Remove deposit limit #382

Open
loredanacirstea wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove deposit limit #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a68cf
Remove channel_deposit_bugbounty_limit from contract
loredanacirstea Jan 18, 2018
85dd0cb
Fix tests after channel deposit limit removal
loredanacirstea Jan 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions contracts/contracts/RaidenMicroTransferChannels.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ contract RaidenMicroTransferChannels {
// Contract semantic version
string public constant version = '0.1.0';

// We temporarily limit total token deposits in a channel to 100 tokens with 18 decimals.
// This was calculated just for RDN with its current (as of 30/11/2017) price and should
// not be considered to be the same for other tokens.
// This is just for the bug bounty release, as a safety measure.
uint256 public constant channel_deposit_bugbounty_limit = 10 ** 18 * 100;

Token public token;

mapping (bytes32 => Channel) public channels;
Expand Down Expand Up @@ -568,8 +562,6 @@ contract RaidenMicroTransferChannels {
uint192 _deposit)
private
{
require(_deposit <= channel_deposit_bugbounty_limit);

uint32 open_block_number = uint32(block.number);

// Create unique identifier from sender, receiver and current block number
Expand Down Expand Up @@ -604,7 +596,6 @@ contract RaidenMicroTransferChannels {

require(channels[key].open_block_number > 0);
require(closing_requests[key].settle_block_number == 0);
require(channels[key].deposit + _added_deposit <= channel_deposit_bugbounty_limit);

channels[key].deposit += _added_deposit;
assert(channels[key].deposit >= _added_deposit);
Expand Down
7 changes: 0 additions & 7 deletions contracts/tests/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@


print_the_logs = False


MAX_UINT256 = 2 ** 256 - 1
MAX_UINT192 = 2 ** 192 - 1
MAX_UINT32 = 2 ** 32 - 1
fake_address = '0x03432'
empty_address = '0x0000000000000000000000000000000000000000'
passphrase = '0'

# recheck test_create_token_fallback_uint_conversion when bug bounty limit is removed
uraiden_contract_version = '0.1.0'
channel_deposit_bugbounty_limit = 100 * 10 ** 18
challenge_period_min = 500
contract_args = [
{
Expand Down Expand Up @@ -45,8 +40,6 @@
'type': '223'
}
]


uraiden_events = {
'created': 'ChannelCreated',
'topup': 'ChannelToppedUp',
Expand Down
98 changes: 5 additions & 93 deletions contracts/tests/test_channel_create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from ethereum import tester
from eth_utils import encode_hex
from tests.fixtures import (
channel_deposit_bugbounty_limit,
contract_params,
channel_params,
owner_index,
Expand Down Expand Up @@ -83,48 +82,6 @@ def test_channel_erc223_create(owner, get_accounts, uraiden_instance, token_inst
token_instance.transact({"from": sender}).transfer(uraiden_instance.address, deposit, txdata)


def test_channel_erc223_create_bounty_limit(
get_block,
owner,
get_accounts,
uraiden_instance,
token_instance):
token = token_instance
(sender, receiver, C, D) = get_accounts(4)
txdata = bytes.fromhex(sender[2:] + receiver[2:])

# Fund accounts with tokens
token.transact({"from": owner}).transfer(sender, channel_deposit_bugbounty_limit + 1)

pre_balance = token_instance.call().balanceOf(uraiden_instance.address)

with pytest.raises(tester.TransactionFailed):
token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
channel_deposit_bugbounty_limit + 1,
txdata
)
with pytest.raises(tester.TransactionFailed):
token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
channel_deposit_bugbounty_limit + 10,
txdata
)

txn_hash = token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
channel_deposit_bugbounty_limit,
txdata
)

post_balance = pre_balance + channel_deposit_bugbounty_limit
assert token_instance.call().balanceOf(uraiden_instance.address) == post_balance
open_block_number = get_block(txn_hash)

channel_data = uraiden_instance.call().getChannelInfo(sender, receiver, open_block_number)
assert channel_data[1] == channel_deposit_bugbounty_limit


def test_create_token_fallback_uint_conversion(
owner,
get_accounts,
Expand Down Expand Up @@ -154,12 +111,11 @@ def test_create_token_fallback_uint_conversion(
txdata
)

# TODO - uncomment this after channel_deposit_bugbounty_limit is removed
# txn_hash = token.transact({"from": sender}).transfer(
# uraiden.address,
# MAX_UINT192,
# txdata
# )
txn_hash = token.transact({"from": sender}).transfer(
uraiden.address,
MAX_UINT192,
txdata
)


def test_channel_erc223_event(
Expand Down Expand Up @@ -231,50 +187,6 @@ def test_channel_erc20_create(owner, get_accounts, uraiden_instance, token_insta
uraiden_instance.transact({"from": sender}).createChannel(receiver, deposit)


def test_channel_erc20_create_bounty_limit(
owner,
get_accounts,
uraiden_instance,
token_instance,
get_block):
token = token_instance
(sender, receiver) = get_accounts(2)

# Fund accounts with tokens
token.transact({"from": owner}).transfer(sender, channel_deposit_bugbounty_limit + 1)

# Approve token allowance
token_instance.transact({"from": sender}).approve(
uraiden_instance.address,
channel_deposit_bugbounty_limit + 1
)

pre_balance = token_instance.call().balanceOf(uraiden_instance.address)

with pytest.raises(tester.TransactionFailed):
uraiden_instance.transact({"from": sender}).createChannel(
receiver,
channel_deposit_bugbounty_limit + 1
)
with pytest.raises(tester.TransactionFailed):
uraiden_instance.transact({"from": sender}).createChannel(
receiver,
channel_deposit_bugbounty_limit + 100
)

txn_hash = uraiden_instance.transact({"from": sender}).createChannel(
receiver,
channel_deposit_bugbounty_limit
)

post_balance = pre_balance + channel_deposit_bugbounty_limit
assert token_instance.call().balanceOf(uraiden_instance.address) == post_balance
open_block_number = get_block(txn_hash)

channel_data = uraiden_instance.call().getChannelInfo(sender, receiver, open_block_number)
assert channel_data[1] == channel_deposit_bugbounty_limit


def test_channel_erc20_event(
owner,
get_accounts,
Expand Down
99 changes: 0 additions & 99 deletions contracts/tests/test_channel_topup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import pytest
from ethereum import tester
from tests.fixtures import (
channel_deposit_bugbounty_limit,
contract_params,
channel_params,
owner_index,
Expand Down Expand Up @@ -76,55 +75,6 @@ def test_channel_topup_223(
ev_handler.check()


def test_channel_topup_223_bounty_limit(
get_accounts,
owner,
uraiden_instance,
token_instance,
get_channel):
token = token_instance
(sender, receiver, A) = get_accounts(3)
channel_deposit = 1
channel = get_channel(uraiden_instance, token_instance, channel_deposit, sender, receiver)[:3]
(sender, receiver, open_block_number) = channel

top_up_data = sender[2:] + receiver[2:] + hex(open_block_number)[2:].zfill(8)
top_up_data = bytes.fromhex(top_up_data)

# See how many tokens we need to reach channel_deposit_bugbounty_limit
added_deposit = channel_deposit_bugbounty_limit - channel_deposit

# Fund accounts with tokens
token.transact({"from": owner}).transfer(sender, added_deposit + 1)

pre_balance = token.call().balanceOf(uraiden_instance.address)

with pytest.raises(tester.TransactionFailed):
token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
added_deposit + 1,
top_up_data
)
with pytest.raises(tester.TransactionFailed):
token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
added_deposit + 20,
top_up_data
)

token_instance.transact({"from": sender}).transfer(
uraiden_instance.address,
added_deposit,
top_up_data
)

post_balance = pre_balance + added_deposit
assert token_instance.call().balanceOf(uraiden_instance.address) == post_balance

channel_data = uraiden_instance.call().getChannelInfo(sender, receiver, open_block_number)
assert channel_data[1] == channel_deposit_bugbounty_limit


def test_channel_topup_20(
get_accounts,
uraiden_instance,
Expand Down Expand Up @@ -194,55 +144,6 @@ def test_channel_topup_20(
ev_handler.check()


def test_channel_topup_20_bounty_limit(
get_accounts,
owner,
uraiden_instance,
token_instance,
get_channel):
token = token_instance
(sender, receiver, A) = get_accounts(3)
channel_deposit = 1
channel = get_channel(uraiden_instance, token_instance, channel_deposit, sender, receiver)[:3]
(sender, receiver, open_block_number) = channel

# See how many tokens we need to reach channel_deposit_bugbounty_limit
added_deposit = channel_deposit_bugbounty_limit - channel_deposit

# Fund accounts with tokens
token.transact({"from": owner}).transfer(sender, added_deposit + 1)

# Approve token allowance
txn_hash = token.transact({"from": sender}).approve(uraiden_instance.address, added_deposit + 1)

pre_balance = token.call().balanceOf(uraiden_instance.address)

with pytest.raises(tester.TransactionFailed):
uraiden_instance.transact({'from': sender}).topUp(
receiver,
open_block_number,
added_deposit + 1
)
with pytest.raises(tester.TransactionFailed):
uraiden_instance.transact({'from': sender}).topUp(
receiver,
open_block_number,
added_deposit + 50
)

uraiden_instance.transact({'from': sender}).topUp(
receiver,
open_block_number,
added_deposit
)

post_balance = pre_balance + added_deposit
assert token_instance.call().balanceOf(uraiden_instance.address) == post_balance

channel_data = uraiden_instance.call().getChannelInfo(sender, receiver, open_block_number)
assert channel_data[1] == channel_deposit_bugbounty_limit


def test_topup_token_fallback_uint_conversion(
contract_params,
owner,
Expand Down
5 changes: 0 additions & 5 deletions contracts/tests/test_uraiden.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from ethereum import tester
from eth_utils import encode_hex, is_same_address
from tests.fixtures import (
channel_deposit_bugbounty_limit,
uraiden_contract_version,
challenge_period_min,
contract_params,
Expand Down Expand Up @@ -72,17 +71,13 @@ def test_uraiden_init(
assert token.call().balanceOf(uraiden.address) == 0
assert web3.eth.getBalance(uraiden.address) == 0

# Temporary limit for the bug bounty release
assert uraiden.call().channel_deposit_bugbounty_limit() == channel_deposit_bugbounty_limit


def test_variable_access(owner, uraiden_contract, token_instance, contract_params):
uraiden = uraiden_contract(token_instance)
assert is_same_address(uraiden.call().owner_address(), owner)
assert is_same_address(uraiden.call().token(), token_instance.address)
assert uraiden.call().challenge_period() == contract_params['challenge_period']
assert uraiden.call().version() == uraiden_contract_version
assert uraiden.call().channel_deposit_bugbounty_limit() == channel_deposit_bugbounty_limit


def test_function_access(
Expand Down