Skip to content

Token Transaction Mutex Removed & Comment Updated #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2020
Merged

Token Transaction Mutex Removed & Comment Updated #333

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
0ef8ecc
Token Transaction Mutex Removed
remedcu Jul 25, 2020
81e06fa
Comment Updated in Escrow
remedcu Jul 26, 2020
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
1 change: 1 addition & 0 deletions contracts/standard/arbitration/MultipleArbitrableTokenTransaction.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ contract MultipleArbitrableTokenTransaction is IArbitrable {
uint splitArbitrationFee = senderFee / 2;
transaction.receiver.send(splitArbitrationFee);
transaction.sender.send(splitArbitrationFee);
// Tokens should not reenter or allow recipients to refuse the transfer.
// In the case of an uneven token amount, one basic token unit can be burnt.
require(transaction.token.transfer(transaction.receiver, amount / 2), "The `transfer` function must not fail.");
require(transaction.token.transfer(transaction.sender, amount / 2), "The `transfer` function must not fail.");
Expand Down
8 changes: 1 addition & 7 deletions contracts/standard/arbitration/MultipleArbitrableTokenTransactionWithFee.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,9 @@ contract MultipleArbitrableTokenTransactionWithFee is IArbitrable {
transaction.amount -= _amount;
uint feeAmount = calculateFeeRecipientAmount(_amount);

uint tokenBalance = transaction.token.balanceOf(address(this)); // A token transaction mutex.
// Tokens should not reenter or allow recipients to refuse the transfer.
transaction.token.transfer(feeRecipient, feeAmount); // It is the responsibility of the feeRecipient to accept Token.
require(transaction.token.transfer(transaction.receiver, _amount - feeAmount), "The `transfer` function must not fail.");
require(transaction.token.balanceOf(address(this)) >= tokenBalance - _amount, "Tried to transfer tokens more than allowed.");

emit Payment(_transactionID, _amount - feeAmount, msg.sender);
emit FeeRecipientPaymentInToken(_transactionID, feeAmount, transaction.token);
Expand Down Expand Up @@ -231,10 +230,8 @@ contract MultipleArbitrableTokenTransactionWithFee is IArbitrable {
transaction.status = Status.Resolved;
uint feeAmount = calculateFeeRecipientAmount(amount);

uint tokenBalance = transaction.token.balanceOf(address(this));
transaction.token.transfer(feeRecipient, feeAmount);
require(transaction.token.transfer(transaction.receiver, amount - feeAmount), "The `transfer` function must not fail.");
require(transaction.token.balanceOf(address(this)) >= tokenBalance - amount, "Tried to transfer tokens more than allowed.");

emit Payment(_transactionID, amount - feeAmount, transaction.sender);
emit FeeRecipientPaymentInToken(_transactionID, feeAmount, transaction.token);
Expand Down Expand Up @@ -409,7 +406,6 @@ contract MultipleArbitrableTokenTransactionWithFee is IArbitrable {

uint feeAmount;

uint tokenBalance = transaction.token.balanceOf(address(this));
// Give the arbitration fee back.
// Note that we use `send` to prevent a party from blocking the execution.
if (_ruling == uint(RulingOptions.SenderWins)) {
Expand Down Expand Up @@ -438,8 +434,6 @@ contract MultipleArbitrableTokenTransactionWithFee is IArbitrable {

emit FeeRecipientPaymentInToken(_transactionID, feeAmount, transaction.token);
}
// If there is uneven token amount, the current token Balance can be greater than tokenBalance - amount, thus >= instead of ==.
require(transaction.token.balanceOf(address(this)) >= tokenBalance - amount, "Tried to transfer tokens more than allowed.");
}

// **************************** //
Expand Down