Skip to content

staking: check caller is the channel proxy when settling #203

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 3 commits into from
May 28, 2020
Merged

staking: check caller is the channel proxy when settling #203

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
c49a11a
staking: validate settle caller is the channel multisig proxy
abarmat May 21, 2020
cd2a657
disputes: fix test
abarmat May 21, 2020
9e815dc
disputes: fix and improve tests
abarmat May 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
2 changes: 1 addition & 1 deletion contracts/DisputeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ contract DisputeManager is Governed {

// Get the indexer that created the channel and signed the attestation
(address indexer, bytes32 subgraphID) = staking.channels(channelID);
require(indexer != address(0), "Indexer cannot be found with the attestation");
require(indexer != address(0), "Indexer cannot be found for the attestation");
require(subgraphID == attestation.subgraphID, "Channel and attestation subgraph must match");

// Create a disputeID
Expand Down
25 changes: 16 additions & 9 deletions contracts/Staking.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ contract Staking is Governed {
// Indexer stake tracking : indexer => Stake
mapping(address => Stakes.Indexer) public stakes;

// Channels : channelID => Channel
mapping(address => Channel) public channels;

// Rebate pools : epoch => Pool
mapping(uint256 => Rebates.Pool) public rebates;

// Channels : channelID => Channel
mapping(address => Channel) public channels;
// Channels Proxy : Channel Multisig Proxy => channelID
mapping(address => address) public channelsProxy;

// List of addresses allowed to slash stakes
mapping(address => bool) public slashers;

Expand Down Expand Up @@ -376,12 +378,14 @@ contract Staking is Governed {
* @param _subgraphID ID of the subgraph where tokens will be allocated
* @param _tokens Amount of tokens to allocate
* @param _channelPubKey The public key used by the indexer to setup the off-chain channel
* @param _channelProxy Address of the multisig proxy used to hold channel funds
* @param _price Price the `indexer` will charge for serving queries of the `subgraphID`
*/
function allocate(
bytes32 _subgraphID,
uint256 _tokens,
bytes calldata _channelPubKey,
address _channelProxy,
uint256 _price
) external {
address indexer = msg.sender;
Expand Down Expand Up @@ -410,6 +414,7 @@ contract Staking is Governed {
alloc.channelID = channelID;
alloc.createdAtEpoch = epochManager.currentEpoch();
channels[channelID] = Channel(indexer, _subgraphID);
channelsProxy[_channelProxy] = channelID;

emit AllocationCreated(
indexer,
Expand All @@ -424,22 +429,24 @@ contract Staking is Governed {

/**
* @dev Settle a channel after receiving collected query fees from it
* @param _channelID Address of the indexer in the channel
* Funds are received from a channel multisig proxy contract
* @param _tokens Amount of tokens to settle
*/
function settle(address _channelID, uint256 _tokens) external {
address channelMultisig = msg.sender;
function settle(uint256 _tokens) external {
// Get the channelID the caller is related
address channelID = channelsProxy[msg.sender];
delete channelsProxy[msg.sender]; // Remove to avoid re-entrancy

// Receive funds from the channel multisig
// We use channelID to find the indexer owner of the channel
require(isChannel(_channelID), "Channel: does not exist");
require(isChannel(channelID), "Channel: does not exist");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be moved above the deletion of channelsProxy

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do and push the changes


// Transfer tokens to settle from multisig to this contract
require(
token.transferFrom(channelMultisig, address(this), _tokens),
token.transferFrom(msg.sender, address(this), _tokens),
"Channel: Cannot transfer tokens to settle"
);
_settle(_channelID, channelMultisig, _tokens);
_settle(channelID, msg.sender, _tokens);
}

/**
Expand Down
Loading