Skip to content
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

Fee distribution events in the RewardableBridge contract #176

Merged
merged 3 commits into from
Apr 22, 2019
Merged

Fee distribution events in the RewardableBridge contract #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd5086b
Fee distribution events moved to the RewardableBridge contract
akolotov Apr 18, 2019
4326644
tests cover emmiting fee dsitribution event for submitSignature call …
akolotov Apr 19, 2019
b6df9b3
syncronize node.js version in TravisCI with the requirements
akolotov Apr 19, 2019
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
group: beta
language: node_js
node_js:
- "9"
- "10"
cache:
yarn: true
env:
Expand Down
4 changes: 2 additions & 2 deletions contracts/upgradeable_contracts/BasicForeignBridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ contract BasicForeignBridge is EternalStorage, Validatable {
require(contractAddress == address(this));
require(!relayedMessages(txHash));
setRelayedMessages(txHash, true);
require(onExecuteMessage(recipient, amount));
require(onExecuteMessage(recipient, amount, txHash));
emit RelayedMessage(recipient, amount, txHash);
} else {
onFailedMessage(recipient, amount, txHash);
}
}

function onExecuteMessage(address, uint256) internal returns(bool);
function onExecuteMessage(address, uint256, bytes32) internal returns(bool);

function setRelayedMessages(bytes32 _txHash, bool _status) internal {
boolStorage[keccak256(abi.encodePacked("relayedMessages", _txHash))] = _status;
Expand Down
9 changes: 7 additions & 2 deletions contracts/upgradeable_contracts/RewardableBridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import "./FeeTypes.sol";

contract RewardableBridge is Ownable, FeeTypes {

event FeeDistributedFromAffirmation(uint256 feeAmount, bytes32 indexed transactionHash);
event FeeDistributedFromSignatures(uint256 feeAmount, bytes32 indexed transactionHash);

function _getFee(bytes32 _feeType) internal view returns(uint256) {
uint256 fee;
address feeManager = feeManagerContract();
Expand Down Expand Up @@ -70,11 +73,13 @@ contract RewardableBridge is Ownable, FeeTypes {
return fee;
}

function distributeFeeFromSignatures(uint256 _fee, address _feeManager) internal {
function distributeFeeFromSignatures(uint256 _fee, address _feeManager, bytes32 _txHash) internal {
require(_feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromSignatures(uint256)", _fee)));
emit FeeDistributedFromSignatures(_fee, _txHash);
}

function distributeFeeFromAffirmation(uint256 _fee, address _feeManager) internal {
function distributeFeeFromAffirmation(uint256 _fee, address _feeManager, bytes32 _txHash) internal {
require(_feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromAffirmation(uint256)", _fee)));
emit FeeDistributedFromAffirmation(_fee, _txHash);
}
}
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ contract ForeignBridgeErcToErc is BasicBridge, BasicForeignBridge {
return ERC20Basic(addressStorage[keccak256(abi.encodePacked("erc20token"))]);
}

function onExecuteMessage(address _recipient, uint256 _amount) internal returns(bool){
function onExecuteMessage(address _recipient, uint256 _amount, bytes32 _txHash) internal returns(bool){
setTotalExecutedPerDay(getCurrentDay(), totalExecutedPerDay(getCurrentDay()).add(_amount));
return erc20token().transfer(_recipient, _amount);
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ contract ForeignBridgeErcToNative is BasicBridge, BasicForeignBridge {
return ERC20Basic(addressStorage[keccak256(abi.encodePacked("erc20token"))]);
}

function onExecuteMessage(address _recipient, uint256 _amount) internal returns(bool) {
function onExecuteMessage(address _recipient, uint256 _amount, bytes32 _txHash) internal returns(bool) {
setTotalExecutedPerDay(getCurrentDay(), totalExecutedPerDay(getCurrentDay()).add(_amount));
return erc20token().transfer(_recipient, _amount);
}
Expand Down
8 changes: 2 additions & 6 deletions contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import "./RewardableHomeBridgeErcToNative.sol";
contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge, OverdrawManagement, RewardableHomeBridgeErcToNative {

event AmountLimitExceeded(address recipient, uint256 value, bytes32 transactionHash);
event FeeDistributedFromAffirmation(uint256 feeAmount, bytes32 indexed transactionHash);
event FeeDistributedFromSignatures(uint256 feeAmount, bytes32 indexed transactionHash);

function () public payable {
require(msg.value > 0);
Expand Down Expand Up @@ -162,9 +160,8 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge,
address feeManager = feeManagerContract();
if (feeManager != address(0)) {
uint256 fee = calculateFee(valueToMint, false, feeManager, FOREIGN_FEE);
distributeFeeFromAffirmation(fee, feeManager);
distributeFeeFromAffirmation(fee, feeManager, txHash);
valueToMint = valueToMint.sub(fee);
emit FeeDistributedFromAffirmation(fee, txHash);
}
blockReward.addExtraReceiver(valueToMint, _recipient);
return true;
Expand All @@ -179,8 +176,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge,
address contractAddress;
(recipient, amount, txHash, contractAddress) = Message.parseMessage(_message);
uint256 fee = calculateFee(amount, true, feeManager, HOME_FEE);
distributeFeeFromSignatures(fee, feeManager);
emit FeeDistributedFromSignatures(fee, txHash);
distributeFeeFromSignatures(fee, feeManager, txHash);
}
}

Expand Down
4 changes: 2 additions & 2 deletions contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ contract ForeignBridgeNativeToErc is ERC677Receiver, BasicBridge, BasicForeignBr
setOwner(_owner);
}

function onExecuteMessage(address _recipient, uint256 _amount) internal returns(bool) {
function onExecuteMessage(address _recipient, uint256 _amount, bytes32 _txHash) internal returns(bool) {
setTotalExecutedPerDay(getCurrentDay(), totalExecutedPerDay(getCurrentDay()).add(_amount));
uint256 valueToMint = _amount;
address feeManager = feeManagerContract();
if (feeManager != address(0)) {
uint256 fee = calculateFee(valueToMint, false, feeManager, HOME_FEE);
distributeFeeFromSignatures(fee, feeManager);
distributeFeeFromSignatures(fee, feeManager, _txHash);
valueToMint = valueToMint.sub(fee);
}
return erc677token().mint(_recipient, valueToMint);
Expand Down
5 changes: 1 addition & 4 deletions contracts/upgradeable_contracts/native_to_erc20/HomeBridgeNativeToErc.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import "../Sacrifice.sol";

contract HomeBridgeNativeToErc is EternalStorage, BasicBridge, BasicHomeBridge, RewardableHomeBridgeNativeToErc {

event FeeDistributedFromAffirmation(uint256 feeAmount, bytes32 indexed transactionHash);

function () public payable {
require(msg.value > 0);
require(msg.data.length == 0);
Expand Down Expand Up @@ -121,9 +119,8 @@ contract HomeBridgeNativeToErc is EternalStorage, BasicBridge, BasicHomeBridge,
address feeManager = feeManagerContract();
if (feeManager != address(0)) {
uint256 fee = calculateFee(valueToTransfer, false, feeManager, FOREIGN_FEE);
distributeFeeFromAffirmation(fee, feeManager);
distributeFeeFromAffirmation(fee, feeManager, txHash);
valueToTransfer = valueToTransfer.sub(fee);
emit FeeDistributedFromAffirmation(fee, txHash);
}

if (!_recipient.send(valueToTransfer)) {
Expand Down
35 changes: 23 additions & 12 deletions test/native_to_erc/foreign_bridge_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,14 @@ contract('ForeignBridge', async (accounts) => {
const vrs = signatureToVRS(signature);

const { logs } = await foreignBridge.executeSignatures([vrs.v], [vrs.r], [vrs.s], message).should.be.fulfilled
logs[0].event.should.be.equal("RelayedMessage")
logs[0].args.recipient.should.be.equal(recipientAccount)
logs[0].args.value.should.be.bignumber.equal(value)
logs[0].args.transactionHash.should.be.equal(transactionHash);

logs[0].event.should.be.equal("FeeDistributedFromSignatures")
logs[0].args.should.be.deep.equal({feeAmount, transactionHash})

logs[1].event.should.be.equal("RelayedMessage")
logs[1].args.recipient.should.be.equal(recipientAccount)
logs[1].args.value.should.be.bignumber.equal(value)
logs[1].args.transactionHash.should.be.equal(transactionHash);

const balanceAfter = await token.balanceOf(recipientAccount);
const totalSupplyAfter = await token.totalSupply();
Expand All @@ -657,6 +661,7 @@ contract('ForeignBridge', async (accounts) => {
const feePerValidator = web3.toBigNumber(166666666666666)
const feePerValidatorPlusDiff = web3.toBigNumber(166666666666668)
const value = halfEther
const feeAmount = value.mul(web3.toBigNumber(fee));
const finalUserValue = value.mul(web3.toBigNumber(1-fee));

const validators = [accounts[1], accounts[2], accounts[3]]
Expand Down Expand Up @@ -687,10 +692,13 @@ contract('ForeignBridge', async (accounts) => {
const { logs } = await foreignBridge.executeSignatures([vrs.v, vrs2.v, vrs3.v], [vrs.r, vrs2.r, vrs3.r], [vrs.s, vrs2.s, vrs3.s], message).should.be.fulfilled

// Then
logs[0].event.should.be.equal("RelayedMessage")
logs[0].args.recipient.should.be.equal(recipientAccount)
logs[0].args.value.should.be.bignumber.equal(value)
logs[0].args.transactionHash.should.be.equal(transactionHash);
logs[0].event.should.be.equal("FeeDistributedFromSignatures")
logs[0].args.should.be.deep.equal({feeAmount, transactionHash})

logs[1].event.should.be.equal("RelayedMessage")
logs[1].args.recipient.should.be.equal(recipientAccount)
logs[1].args.value.should.be.bignumber.equal(value)
logs[1].args.transactionHash.should.be.equal(transactionHash);

const balanceAfter = await token.balanceOf(recipientAccount);
const totalSupplyAfter = await token.totalSupply();
Expand Down Expand Up @@ -750,10 +758,13 @@ contract('ForeignBridge', async (accounts) => {
const { logs } = await foreignBridge.executeSignatures([vrs.v, vrs2.v, vrs3.v], [vrs.r, vrs2.r, vrs3.r], [vrs.s, vrs2.s, vrs3.s], message).should.be.fulfilled

// Then
logs[0].event.should.be.equal("RelayedMessage")
logs[0].args.recipient.should.be.equal(recipientAccount)
logs[0].args.value.should.be.bignumber.equal(value)
logs[0].args.transactionHash.should.be.equal(transactionHash);
logs[0].event.should.be.equal("FeeDistributedFromSignatures")
logs[0].args.should.be.deep.equal({feeAmount, transactionHash})

logs[1].event.should.be.equal("RelayedMessage")
logs[1].args.recipient.should.be.equal(recipientAccount)
logs[1].args.value.should.be.bignumber.equal(value)
logs[1].args.transactionHash.should.be.equal(transactionHash);

const balanceAfter = await token.balanceOf(recipientAccount);
const totalSupplyAfter = await token.totalSupply();
Expand Down