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

fix: correct setup and build issues #116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: correct setup and build issues #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions contracts/badger-sett/strategies/native/StrategyCurveLiquidityRewardGaugeBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ contract StrategyCurveLiquidityRewardGaugeBase is BaseStrategy {
mintr = _wantConfig[2];
curveSwap = _wantConfig[3];
lpComponent = _wantConfig[4];
lpRewardWhitelist[0x85eee30c52b0b379b046fb0f85f4f3dc3009afec] = true;
lpRewardWhitelist[address(0x85Eee30c52B0b379b046Fb0F85F4f3Dc3009aFEC)] = true;

performanceFeeGovernance = _feeConfig[0];
performanceFeeStrategist = _feeConfig[1];
Expand Down Expand Up @@ -124,7 +124,7 @@ contract StrategyCurveLiquidityRewardGaugeBase is BaseStrategy {
return protectedTokens;
}

function getLpRewardStatus(address _lpReward) public override view returns (bool memory) {
function getLpRewardStatus(address _lpReward) public view returns (bool) {
return lpRewardWhitelist[_lpReward];
}

Expand Down Expand Up @@ -244,7 +244,8 @@ contract StrategyCurveLiquidityRewardGaugeBase is BaseStrategy {
if (lpReward != address(0) && getLpRewardStatus(lpReward) && ICurveLiquidityRewardGauge(gauge).rewards_for(address(this)) > 0) {
ICurveGauge(gauge).claim_rewards();
claimData.lpRewardClaimed = IERC20Upgradeable(lpReward).balanceOf(address(this));
_swap(lpReward, claimData.lpRewardClaimed, path);
// TODO - add path here
// _swap(lpReward, claimData.lpRewardClaimed, path);
}

// Take fees from claim, and send remainder to merkle tree
Expand Down
2 changes: 1 addition & 1 deletion contracts/badger-timelock/GovernanceTimelock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ contract GovernanceTimelock {
}

// solium-disable-next-line security/no-call-value
(bool success, bytes memory returnData) = target.call.value(value)(callData);
(bool success, bytes memory returnData) = target.call{value: value}(callData);
require(success, "Timelock::executeTransaction: Transaction execution reverted.");

emit ExecuteTransaction(txHash, target, value, signature, data, eta);
Expand Down
1 change: 1 addition & 0 deletions helpers/registry/eth_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from brownie.network import web3
from dotmap import DotMap
from helpers.registry.WhaleRegistryAction import WhaleRegistryAction
import json

with open("dependency-artifacts/defidollar/BadgerSettPeak.json") as f:
BadgerSettPeak = json.load(f)
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ tabulate==0.8.7
ens-namehash==1.0.0
rich==9.3.0
boto3==1.16.28
python-dotenv==0.15.0
python-dotenv==0.16.0
multicall==0.1.1
python-decouple==3.3
gql==3.0.0a5
aiohttp==3.7.3
aiohttp==3.7.3
ape-safe==0.1.4
3 changes: 2 additions & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ def badger_single_sett(settConfig, deploy=True):
# Both want/pid are optional params and used for validation.
# In this case, both the lp token and pid (pool id) exist so we can pass them in.
want=registry.pancake.chefPairs.bnbBtcb,
pid=registry.pancake.chefPids.bnbBtcb,
pid=registry.pancake.chefPids.bnbBtcb
).deploy(deploy=deploy)
if settId == "native.sushiWbtcIbBtc":
return SushiWbtcIbBtcLpOptimizerMiniDeploy(
"native.sushiWbtcIbBtc",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# yarn lockfile v1


"@CoinSpace/bitcore-lib-dogecoin@github:CoinSpace/bitcore-lib-dogecoin":
"@CoinSpace/bitcore-lib-dogecoin@CoinSpace/bitcore-lib-dogecoin":
version "8.1.2"
resolved "https://codeload.github.com/CoinSpace/bitcore-lib-dogecoin/tar.gz/cf8b3f663d6f065c12a643d8eb7c9e7b7f516bf1"
dependencies:
Expand Down Expand Up @@ -2282,7 +2282,7 @@ bitcore-lib-cash@^8.24.2:
inherits "=2.0.1"
lodash "^4.17.20"

"bitcore-lib-zcash@github:zcash-hackworks/bitcore-lib-zcash":
bitcore-lib-zcash@zcash-hackworks/bitcore-lib-zcash:
version "0.13.19"
resolved "https://codeload.github.com/zcash-hackworks/bitcore-lib-zcash/tar.gz/e97ae1dd2e9f14d6076d5e5429c75d8965afa4ab"
dependencies:
Expand Down Expand Up @@ -2790,7 +2790,7 @@ cashaddrjs@^0.3.12:
dependencies:
big-integer "1.6.36"

"chai-bignumber@github:ren-forks/chai-bignumber#afa6f46dcbef0b7e622dc27b9b3354fc67afafbc":
chai-bignumber@ren-forks/chai-bignumber#afa6f46dcbef0b7e622dc27b9b3354fc67afafbc:
version "2.0.2"
resolved "https://codeload.github.com/ren-forks/chai-bignumber/tar.gz/afa6f46dcbef0b7e622dc27b9b3354fc67afafbc"

Expand Down