Skip to content

Commit

Permalink
Merge pull request #55 from krzysu/master
Browse files Browse the repository at this point in the history
fix exports and improve kyber docs
  • Loading branch information
adrianmcli authored May 27, 2020
2 parents 276664e + e0edb79 commit 877425a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 18 deletions.
27 changes: 11 additions & 16 deletions docs/kyber.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ contract KyberNetworkProxy is KyberNetworkProxyInterface, SimpleNetworkInterface
```js
const { ethers } = require("ethers");
const { getLegosFor, networks } = require("@studydefi/money-legos");

const legos = getLegosFor(networks.mainnet);
const erc20 = require("@studydefi/money-legos/erc20");
const kyber = require("@studydefi/money-legos/kyber");

const provider = new ethers.providers.JsonRpcProvider(
process.env.PROVIDER_URL || "http://localhost:8545",
Expand All @@ -69,20 +68,16 @@ const swapOnKyber = async (fromAddress, toAddress, fromAmountWei) => {
const minConversionRate = 1;

const kyberNetwork = new ethers.Contract(
legos.kyber.contracts.network.address,
legos.kyber.contracts.factnetworkry.abi,
kyber.network.address,
kyber.network.abi,
wallet,
);

// ERC20 contract
const fromTokenContract = new ethers.Contract(
fromAddress,
legos.erc20.contracts.abi,
wallet,
);
const fromTokenContract = new ethers.Contract(fromAddress, erc20.abi, wallet);

// ETH -> Token
if (fromAddress === legos.erc20.contracts.eth.address) {
if (fromAddress === erc20.eth.address) {
return kyberNetwork.swapEtherToToken(toAddress, minConversionRate, {
gasLimit,
value: fromAmountWei,
Expand All @@ -93,7 +88,7 @@ const swapOnKyber = async (fromAddress, toAddress, fromAmountWei) => {
await fromTokenContract.approve(kyberNetwork.address, fromAmountWei);

// Token -> ETH
if (toAddress === legos.erc20.contracts.eth.address) {
if (toAddress === erc20.eth.address) {
return fromExchangeContract.swapTokenToEther(
fromAddress,
fromAmountWei,
Expand Down Expand Up @@ -125,7 +120,7 @@ const swapAndLog = async (fromToken, toToken, amount) => {
ethers.utils.parseUnits(amount.toString(), fromToken.decimals),
);

if (toToken === legos.erc20.contracts.eth) {
if (toToken === erc20.eth) {
const ethBalWei = await wallet.getBalance();
console.log(
`${toToken.symbol} balance: ${ethers.utils.formatEther(ethBalWei)}`,
Expand All @@ -145,9 +140,9 @@ const swapAndLog = async (fromToken, toToken, amount) => {
};

const main = async () => {
await swapAndLog(legos.erc20.contracts.eth, legos.erc20.contracts.dai, 1);
await swapAndLog(legos.erc20.contracts.dai, legos.erc20.contracts.rep, 50);
await swapAndLog(legos.erc20.contracts.rep, legos.erc20.contracts.eth, 2);
await swapAndLog(erc20.eth, erc20.dai, 1);
await swapAndLog(erc20.dai, erc20.rep, 50);
await swapAndLog(erc20.rep, erc20.eth, 2);
};

main();
Expand Down
2 changes: 1 addition & 1 deletion src/idle/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { default as contracts } from "./contracts";
import abi from "./abi/IdleTokenV3.json";

export default {
export = {
...contracts,
abi,
decimals: 18,
Expand Down
2 changes: 1 addition & 1 deletion src/kyber/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { default as contracts } from "./contracts";

export default {
export = {
...contracts,
};

1 comment on commit 877425a

@vercel
Copy link

@vercel vercel bot commented on 877425a May 27, 2020

Choose a reason for hiding this comment

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

Please sign in to comment.