From 193b57b05cba4182f518447a192ae8d30be6828b Mon Sep 17 00:00:00 2001 From: Lecky Lao Date: Sun, 19 Jul 2020 20:06:58 +1000 Subject: [PATCH 1/2] uses stakingToken instead of snxToken --- contracts/connectors/synthetix.sol | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/contracts/connectors/synthetix.sol b/contracts/connectors/synthetix.sol index 28734bb..18bef51 100644 --- a/contracts/connectors/synthetix.sol +++ b/contracts/connectors/synthetix.sol @@ -30,13 +30,6 @@ contract SynthetixStakingHelper is DSMath, Stores { return 0x772590F33eD05b0E83553650BF9e75A04b337526; // InstaMapping Address } - /** - * @dev Return Synthetix Token address. - */ - function getSnxAddr() internal virtual view returns (address) { - return 0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F; - } - /** * @dev Convert String to bytes32. */ @@ -138,13 +131,11 @@ contract SynthetixStaking is SynthetixStakingHelper { uint _amt = getUint(getId, amt); (IStakingRewards stakingContract, TokenInterface stakingToken, bytes32 stakingType) = getStakingData(stakingPoolName); - TokenInterface snxToken = TokenInterface(getSnxAddr()); - _amt = _amt == uint(-1) ? stakingContract.balanceOf(address(this)) : _amt; - uint intialBal = snxToken.balanceOf(address(this)); + uint intialBal = stakingToken.balanceOf(address(this)); stakingContract.withdraw(_amt); stakingContract.getReward(); - uint finalBal = snxToken.balanceOf(address(this)); + uint finalBal = stakingToken.balanceOf(address(this)); uint rewardAmt = sub(finalBal, intialBal); @@ -173,11 +164,9 @@ contract SynthetixStaking is SynthetixStakingHelper { ) external payable { (IStakingRewards stakingContract, TokenInterface stakingToken, bytes32 stakingType) = getStakingData(stakingPoolName); - TokenInterface snxToken = TokenInterface(getSnxAddr()); - - uint intialBal = snxToken.balanceOf(address(this)); + uint intialBal = stakingToken.balanceOf(address(this)); stakingContract.getReward(); - uint finalBal = snxToken.balanceOf(address(this)); + uint finalBal = stakingToken.balanceOf(address(this)); uint rewardAmt = sub(finalBal, intialBal); From 359b6adf36fd2e00439f5e609083df31095818e8 Mon Sep 17 00:00:00 2001 From: Lecky Lao Date: Sun, 19 Jul 2020 20:11:37 +1000 Subject: [PATCH 2/2] fixing library import error; passing test by removing the getSnxAddr in mockSynthetix; --- contracts/connectors/instapool.sol | 4 ++-- contracts/tests/MockSynthetix.sol | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/contracts/connectors/instapool.sol b/contracts/connectors/instapool.sol index 1f16076..ceb75d3 100644 --- a/contracts/connectors/instapool.sol +++ b/contracts/connectors/instapool.sol @@ -1,8 +1,8 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import { SafeERC20 } from "../../node_modules/@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; -import { IERC20 } from "../../node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; interface LiqudityInterface { function deposit(address, uint) external payable; diff --git a/contracts/tests/MockSynthetix.sol b/contracts/tests/MockSynthetix.sol index b2a1dcd..0e5d732 100644 --- a/contracts/tests/MockSynthetix.sol +++ b/contracts/tests/MockSynthetix.sol @@ -14,10 +14,6 @@ contract MockSynthetixStaking is ConnectSynthetixStaking{ function emitEvent(bytes32 eventCode, bytes memory eventData) override internal {} - function getSnxAddr() override internal view returns (address) { - return synthetixStakingAddr; - } - function getMappingAddr() override internal view returns (address) { return instaMappingAddr; }