Skip to content

Improvements of xKlerosLiquid for v2 #557

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
jaybuidl merged 3 commits into from
Feb 1, 2023
Merged

Improvements of xKlerosLiquid for v2 #557

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
3f78e40
fix(xLiquid): small fixes
unknownunknown1 Feb 1, 2023
6c913c7
fix(xLiquid): simplification
unknownunknown1 Feb 1, 2023
3840512
fix(xLiquid): jb's feedback
unknownunknown1 Feb 1, 2023
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: 0 additions & 2 deletions contracts/src/gateway/interfaces/IForeignGateway.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ interface IForeignGateway is IArbitrator, IReceiverGateway {

function withdrawFees(bytes32 _disputeHash) external;

// TODO: add withdrawal for ERC20?

// For cross-chain Evidence standard
function disputeHashToForeignID(bytes32 _disputeHash) external view returns (uint256);

Expand Down
7 changes: 3 additions & 4 deletions contracts/src/gateway/xForeignGateway.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ contract xForeignGateway is IForeignGateway {
// ************************************* //

function createDispute(
uint256 _choices,
bytes calldata _extraData
uint256 /*_choices*/,
bytes calldata /*_extraData*/
) external payable override returns (uint256 disputeID) {
// TODO
revert("Fees should be paid in WETH");
}

function createDisputeERC20(
Expand Down Expand Up @@ -195,7 +195,6 @@ contract xForeignGateway is IForeignGateway {
arbitrable.rule(dispute.id, _ruling);
}

// TODO: separate regular withdrawal from ERC20
function withdrawFees(bytes32 _disputeHash) external override {
DisputeData storage dispute = disputeHashtoDisputeData[_disputeHash];
require(dispute.id != 0, "Dispute does not exist");
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/kleros-v1/kleros-liquid-xdai/WrappedPinakion.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8;

import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
import "../../libraries/SafeMath.sol";
import "@openzeppelin/contracts/utils/math/SafeMath.sol";
import "../interfaces/ITokenController.sol";
import "./interfaces/ITokenBridge.sol";
import "./interfaces/IERC677.sol";
Expand Down
Loading