Instadapp/dsa-connectors-old
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors-old.git synced 2024-07-29 22:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issues

Browse Source
This commit is contained in:
Mubaris NK 2020-11-16 01:05:00 +05:30
parent c7c5a0e8a4
commit bde193b6e7
2 changed files with 79 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contracts/connectors/aave_v2.sol
View File

@ -120,22 +120,25 @@ contract BasicResolver is AaveHelpers {
uint _amt = amt; uint _amt = amt;
AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool());
AaveDataProviderInterface aaveData = getAaveDataProvider(); AaveDataProviderInterface aaveData = getAaveDataProvider();
address _token = token == getEthAddr() ? getWethAddr() : token;
TokenInterface tokenContract;
if (token == getEthAddr()) { if (token == getEthAddr()) {
_amt = _amt == uint(-1) ? address(this).balance : _amt; _amt = _amt == uint(-1) ? address(this).balance : _amt;
TokenInterface tokenContract = TokenInterface(getWethAddr()); tokenContract = TokenInterface(getWethAddr());
convertEthToWeth(tokenContract, _amt); convertEthToWeth(tokenContract, _amt);
_token = getWethAddr(); _token = getWethAddr();
} else { } else {
TokenInterface tokenContract = TokenInterface(token); tokenContract = TokenInterface(token);
_amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt;
} }
tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); tokenContract.approve(getAaveProvider().getLendingPool(), _amt);
aave.deposit(_token, _amt, address(this), getReferralCode()); aave.deposit(_token, _amt, address(this), getReferralCode());
if (!getIsColl(aaveData, _token, address(0))) { if (!getIsColl(aaveData, _token, address(this))) {
aave.setUserUseReserveAsCollateral(_token, true); aave.setUserUseReserveAsCollateral(_token, true);
} }
@ -190,18 +193,20 @@ contract BasicResolver is AaveHelpers {
// uint _amt = getUint(getId, amt); // uint _amt = getUint(getId, amt);
uint _amt = amt; uint _amt = amt;
AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool());
address _token = token == getEthAddr() ? getWethAddr() : token;
TokenInterface tokenContract;
if (token == getEthAddr()) { if (token == getEthAddr()) {
_amt = _amt == uint(-1) ? address(this).balance : _amt; _amt = _amt == uint(-1) ? address(this).balance : _amt;
TokenInterface tokenContract = TokenInterface(getWethAddr()); tokenContract = TokenInterface(getWethAddr());
convertEthToWeth(tokenContract, _amt); convertEthToWeth(tokenContract, _amt);
_token = getWethAddr(); _token = getWethAddr();
} else { } else {
TokenInterface tokenContract = TokenInterface(token); tokenContract = TokenInterface(token);
_amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt;
} }
tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); tokenContract.approve(getAaveProvider().getLendingPool(), _amt);
aave.repay(_token, _amt, rateMode, address(this)); aave.repay(_token, _amt, rateMode, address(this));

104
package-lock.json generated
View File

@ -1230,6 +1230,21 @@
"resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz",
"integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw=="
}, },
"scrypt-shim": {
"version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb",
"from": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb",
"requires": {
"scryptsy": "^2.1.0",
"semver": "^6.3.0"
},
"dependencies": {
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
}
}
},
"setimmediate": { "setimmediate": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz",
@ -1427,7 +1442,6 @@
"eth-lib": "0.2.7", "eth-lib": "0.2.7",
"ethereumjs-common": "^1.3.2", "ethereumjs-common": "^1.3.2",
"ethereumjs-tx": "^2.1.1", "ethereumjs-tx": "^2.1.1",
"scrypt-shim": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb",
"underscore": "1.9.1", "underscore": "1.9.1",
"uuid": "3.3.2", "uuid": "3.3.2",
"web3-core": "1.2.2", "web3-core": "1.2.2",
@ -1531,8 +1545,20 @@
"integrity": "sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA==", "integrity": "sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA==",
"requires": { "requires": {
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.2.2", "web3-core-helpers": "1.2.2"
"websocket": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400" },
"dependencies": {
"websocket": {
"version": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400",
"from": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400",
"requires": {
"debug": "^2.2.0",
"es5-ext": "^0.10.50",
"nan": "^2.14.0",
"typedarray-to-buffer": "^3.1.5",
"yaeti": "^0.0.6"
}
}
} }
}, },
"web3-shh": { "web3-shh": {
@ -1663,9 +1689,9 @@
"integrity": "sha512-kUVUvrqttndeprLoXjI5arWHeiP3uh4XODAKbG+ZaWHCVQeelxCbnXBeWxZ2BPHdXgH0xR9dU1b916JhDhbgAA==" "integrity": "sha512-kUVUvrqttndeprLoXjI5arWHeiP3uh4XODAKbG+ZaWHCVQeelxCbnXBeWxZ2BPHdXgH0xR9dU1b916JhDhbgAA=="
}, },
"@studydefi/money-legos": { "@studydefi/money-legos": {
"version": "2.3.5", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/@studydefi/money-legos/-/money-legos-2.3.5.tgz", "resolved": "https://registry.npmjs.org/@studydefi/money-legos/-/money-legos-2.4.1.tgz",
"integrity": "sha512-Whfsw+Ka5PCX8u7za0DOnb3j7DqPQ0QW2SjtjrC4drP+MRpq6ANdxTLgAqYU2e5BZ3/DrDZ6MGTajMCPKXoxZw==", "integrity": "sha512-60LErLtI+q0bCuwnhGQxK2pdsKPrwMYeQaIekXP2FOBUm6+k0qGl3Q5tly0eX2PkdC8ycxWeQSUvTIAHhmr4aQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@openzeppelin/contracts": "^2.5.0" "@openzeppelin/contracts": "^2.5.0"
@ -4958,7 +4984,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -4979,12 +5006,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -4999,17 +5028,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -5126,7 +5158,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -5138,6 +5171,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -5152,6 +5186,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@ -5159,12 +5194,14 @@
"minimist": { "minimist": {
"version": "1.2.5", "version": "1.2.5",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -5183,6 +5220,7 @@
"version": "0.5.3", "version": "0.5.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "^1.2.5" "minimist": "^1.2.5"
} }
@ -5244,7 +5282,8 @@
"npm-normalize-package-bin": { "npm-normalize-package-bin": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"npm-packlist": { "npm-packlist": {
"version": "1.4.8", "version": "1.4.8",
@ -5272,7 +5311,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -5284,6 +5324,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -5361,7 +5402,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -5397,6 +5439,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -5416,6 +5459,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -5459,12 +5503,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
@ -9365,21 +9411,6 @@
"resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz",
"integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q="
}, },
"scrypt-shim": {
"version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb",
"from": "github:web3-js/scrypt-shim",
"requires": {
"scryptsy": "^2.1.0",
"semver": "^6.3.0"
},
"dependencies": {
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
}
}
},
"scryptsy": { "scryptsy": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz",
@ -9840,7 +9871,7 @@
"integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=",
"dev": true, "dev": true,
"requires": { "requires": {
"bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "bignumber.js": "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
"crypto-js": "^3.1.4", "crypto-js": "^3.1.4",
"utf8": "^2.1.1", "utf8": "^2.1.1",
"xhr2": "*", "xhr2": "*",
@ -11657,8 +11688,7 @@
"integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==",
"requires": { "requires": {
"underscore": "1.9.1", "underscore": "1.9.1",
"web3-core-helpers": "1.2.1", "web3-core-helpers": "1.2.1"
"websocket": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e"
}, },
"dependencies": { "dependencies": {
"debug": { "debug": {
@ -11676,7 +11706,7 @@
}, },
"websocket": { "websocket": {
"version": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e", "version": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e",
"from": "github:web3-js/WebSocket-Node#polyfill/globalThis", "from": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e",
"requires": { "requires": {
"debug": "^2.2.0", "debug": "^2.2.0",
"es5-ext": "^0.10.50", "es5-ext": "^0.10.50",