Skip to content

Update dependencies to enable Greenkeeper 🌴 #393

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
merged 16 commits into from
Nov 8, 2018
Merged

Update dependencies to enable Greenkeeper 🌴 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b87e80b
chore: add Greenkeeper config file
greenkeeper[bot] Nov 5, 2018
46e7260
chore(package): update dependencies
greenkeeper[bot] Nov 5, 2018
109a150
chore(package): update dependencies
greenkeeper[bot] Nov 5, 2018
5ba3c1b
docs(readme): add Greenkeeper badge
greenkeeper[bot] Nov 5, 2018
a60e346
chore(package): update lockfile CLI/yarn.lock
greenkeeper[bot] Nov 5, 2018
fbf9399
chore(package): update lockfile yarn.lock
greenkeeper[bot] Nov 5, 2018
f33e12a
greenkeeper-fix
maxsam4 Nov 5, 2018
3c6d474
Changed BigNumber version
maxsam4 Nov 5, 2018
bcc1722
sim test fix
maxsam4 Nov 5, 2018
647d2c8
another fix
maxsam4 Nov 5, 2018
d0cef81
Merge branch 'master' into greenkeeper/initial
maxsam4 Nov 5, 2018
df1fa5c
rolled back hdwallet upgrade
maxsam4 Nov 5, 2018
105f9bc
Merge branch 'greenkeeper/initial' of https://github.com/PolymathNetw…
maxsam4 Nov 5, 2018
f9ca551
Merge branch 'master' into greenkeeper/initial
maxsam4 Nov 5, 2018
12fec38
Merge branch 'master' into greenkeeper/initial
maxsam4 Nov 6, 2018
d6eeb65
Merge branch 'master' into greenkeeper/initial
maxsam4 Nov 8, 2018
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: 1 addition & 1 deletion CLI/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"readline-sync": "^1.4.9",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"web3": "^1.0.0-beta.35"
"web3": "1.0.0-beta.34"
}
}
464 changes: 176 additions & 288 deletions CLI/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.org/PolymathNetwork/polymath-core.svg?branch=master)](https://travis-ci.org/PolymathNetwork/polymath-core)
[![Coverage Status](https://coveralls.io/repos/github/PolymathNetwork/polymath-core/badge.svg?branch=master)](https://coveralls.io/github/PolymathNetwork/polymath-core?branch=master)
[![Gitter](https://img.shields.io/badge/chat-gitter-green.svg)](https://gitter.im/PolymathNetwork/Lobby)
[![Telegram](https://img.shields.io/badge/50k+-telegram-blue.svg)](https://gitter.im/PolymathNetwork/Lobby)
[![Telegram](https://img.shields.io/badge/50k+-telegram-blue.svg)](https://gitter.im/PolymathNetwork/Lobby) [![Greenkeeper badge](https://badges.greenkeeper.io/PolymathNetwork/polymath-core.svg)](https://greenkeeper.io/)

![Polymath logo](Polymath.png)

Expand Down
10 changes: 10 additions & 0 deletions greenkeeper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"groups": {
"default": {
"packages": [
"CLI/package.json",
"package.json"
]
}
}
}
23 changes: 13 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,30 +60,30 @@
"babel-preset-stage-2": "6.24.1",
"babel-preset-stage-3": "6.24.1",
"babel-register": "6.26.0",
"bignumber.js": "^5.0.0",
"bignumber.js": "5.0.0",
"chalk": "^2.4.1",
"coveralls": "^3.0.1",
"ethereumjs-testrpc": "^6.0.3",
"ethers": "^3.0.15",
"fs": "0.0.1-security",
"ethers": "^4.0.7",
"fs": "0.0.2",
"openzeppelin-solidity": "1.10.0",
"readline-sync": "^1.4.9",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"shelljs": "^0.8.2",
"solc": "^0.4.24",
"truffle-contract": "^3.0.4",
"truffle-hdwallet-provider-privkey": "^0.1.0",
"truffle-hdwallet-provider-privkey": "0.2.0",
"web3": "1.0.0-beta.34"
},
"devDependencies": {
"@soldoc/soldoc": "^0.4.3",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint": "^5.8.0",
"eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.10.0",
"eslint-plugin-node": "^6.0.1",
"eslint-plugin-promise": "^3.7.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-node": "^8.0.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-standard": "^4.0.0",
"ethereum-bridge": "^0.6.1",
"ethereumjs-abi": "^0.6.5",
"fast-csv": "^2.4.1",
Expand All @@ -98,7 +98,10 @@
},
"greenkeeper": {
"ignore": [
"openzeppelin-solidity"
"openzeppelin-solidity",
"web3",
"bignumber.js",
"truffle-hdwallet-provider-privkey"
]
}
}
2 changes: 1 addition & 1 deletion test/b_capped_sto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ contract("CappedSTO", accounts => {
it("Should fundRaised value equal to the raised value in the funds receiver wallet", async () => {
const newBalance = await web3.eth.getBalance(account_fundsReceiver);
//console.log("WWWW",newBalance,await I_CappedSTO.fundsRaised.call(),balanceOfReceiver);
let op = BigNumber(newBalance)
let op = new BigNumber(newBalance)
.minus(balanceOfReceiver)
.toNumber();
assert.equal(
Expand Down
34 changes: 17 additions & 17 deletions test/c_checkpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ contract("Checkpoints", accounts => {
let cps = [];
let ts = [];
for (let j = 0; j < 10; j++) {
let balance1 = BigNumber(await I_SecurityToken.balanceOf(account_investor1));
let balance2 = BigNumber(await I_SecurityToken.balanceOf(account_investor2));
let balance3 = BigNumber(await I_SecurityToken.balanceOf(account_investor3));
let totalSupply = BigNumber(await I_SecurityToken.totalSupply());
let balance1 = new BigNumber(await I_SecurityToken.balanceOf(account_investor1));
let balance2 = new BigNumber(await I_SecurityToken.balanceOf(account_investor2));
let balance3 = new BigNumber(await I_SecurityToken.balanceOf(account_investor3));
let totalSupply = new BigNumber(await I_SecurityToken.totalSupply());
cps.push([balance1, balance2, balance3]);
ts.push(totalSupply);
console.log(
Expand Down Expand Up @@ -265,18 +265,18 @@ contract("Checkpoints", accounts => {
receiver = account_investor3;
}
let m = Math.random();
let amount = BigNumber(await I_SecurityToken.balanceOf(sender))
let amount = new BigNumber(await I_SecurityToken.balanceOf(sender))
.mul(Math.random().toFixed(10))
.toFixed(0);
if (m > 0.8) {
console.log("Sending full balance");
amount = BigNumber(await I_SecurityToken.balanceOf(sender));
amount = new BigNumber(await I_SecurityToken.balanceOf(sender));
}
console.log("Sender: " + sender + " Receiver: " + receiver + " Amount: " + JSON.stringify(amount));
await I_SecurityToken.transfer(receiver, amount, { from: sender });
}
if (Math.random() > 0.5) {
let n = BigNumber(Math.random().toFixed(10))
let n = new BigNumber(Math.random().toFixed(10))
.mul(10 ** 17)
.toFixed(0);
let p = Math.random() * 3;
Expand All @@ -293,7 +293,7 @@ contract("Checkpoints", accounts => {
await I_SecurityToken.mint(minter, n, { from: token_owner });
}
if (Math.random() > 0.5) {
let n = BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
let n = new BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
let p = Math.random() * 3;
let r = Math.random() * 3;
let burner;
Expand All @@ -304,7 +304,7 @@ contract("Checkpoints", accounts => {
} else {
burner = account_investor3;
}
let burnerBalance = BigNumber(await I_SecurityToken.balanceOf(burner));
let burnerBalance = new BigNumber(await I_SecurityToken.balanceOf(burner));
if (n.gt(burnerBalance.div(2))) {
n = burnerBalance.div(2);
}
Expand All @@ -314,10 +314,10 @@ contract("Checkpoints", accounts => {
}
console.log("Checking Interim...");
for (let k = 0; k < cps.length; k++) {
let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
let balances = [balance1, balance2, balance3];
console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
assert.isTrue(totalSupply.eq(ts[k]));
Expand All @@ -330,10 +330,10 @@ contract("Checkpoints", accounts => {
}
console.log("Checking...");
for (let k = 0; k < cps.length; k++) {
let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
let balances = [balance1, balance2, balance3];
console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
assert.isTrue(totalSupply.eq(ts[k]));
Expand Down
76 changes: 38 additions & 38 deletions test/e_erc20_dividends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,11 @@ contract("ERC20DividendCheckpoint", accounts => {
});

it("Issuer pushes dividends iterating over account holders - dividends proportional to checkpoint", async () => {
let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
await I_ERC20DividendCheckpoint.pushDividendPayment(0, 0, 10, { from: token_owner, gas: 5000000 });
let investor1BalanceAfter = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor1BalanceAfter = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
assert.equal(investor1BalanceAfter.sub(investor1Balance).toNumber(), web3.utils.toWei("0.5", "ether"));
assert.equal(investor2BalanceAfter.sub(investor2Balance).toNumber(), web3.utils.toWei("1", "ether"));
//Check fully claimed
Expand Down Expand Up @@ -515,13 +515,13 @@ contract("ERC20DividendCheckpoint", accounts => {

it("should investor 3 claims dividend", async () => {
console.log((await I_ERC20DividendCheckpoint.dividends(2))[5].toNumber());
let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
await I_ERC20DividendCheckpoint.pullDividendPayment(2, { from: account_investor3, gasPrice: 0 });
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), 0);
assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), web3.utils.toWei("7", "ether"));
Expand All @@ -533,15 +533,15 @@ contract("ERC20DividendCheckpoint", accounts => {

it("should issuer pushes remain", async () => {
console.log((await I_ERC20DividendCheckpoint.dividends(2))[5].toNumber());
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investorTempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investorTempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
await I_ERC20DividendCheckpoint.pushDividendPayment(2, 0, 10, { from: token_owner });
let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investorTempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let investorTempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), web3.utils.toWei("3", "ether"));
assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
Expand Down Expand Up @@ -778,31 +778,31 @@ contract("ERC20DividendCheckpoint", accounts => {
});

it("Investor 2 claims dividend", async () => {
let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalance = BigNumber(await web3.eth.getBalance(account_temp));
let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalance = new BigNumber(await web3.eth.getBalance(account_temp));
await I_ERC20DividendCheckpoint.pullDividendPayment(3, { from: account_investor2, gasPrice: 0 });
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter1 = BigNumber(await web3.eth.getBalance(account_temp));
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_temp));
assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), web3.utils.toWei("1.8", "ether"));
assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), 0);
assert.equal(tempBalanceAfter1.sub(tempBalance).toNumber(), 0);
});

it("Should issuer pushes temp investor - investor1 excluded", async () => {
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
await I_ERC20DividendCheckpoint.pushDividendPaymentToAddresses(3, [account_temp, account_investor1], { from: token_owner });
let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
let tempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), 0);
assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
Expand All @@ -823,9 +823,9 @@ contract("ERC20DividendCheckpoint", accounts => {
});

it("Issuer reclaims withholding tax", async () => {
let issuerBalance = BigNumber(await I_PolyToken.balanceOf(token_owner));
let issuerBalance = new BigNumber(await I_PolyToken.balanceOf(token_owner));
await I_ERC20DividendCheckpoint.withdrawWithholding(3, { from: token_owner, gasPrice: 0 });
let issuerBalanceAfter = BigNumber(await I_PolyToken.balanceOf(token_owner));
let issuerBalanceAfter = new BigNumber(await I_PolyToken.balanceOf(token_owner));
assert.equal(issuerBalanceAfter.sub(issuerBalance).toNumber(), web3.utils.toWei("0.4", "ether"));
});

Expand All @@ -843,9 +843,9 @@ contract("ERC20DividendCheckpoint", accounts => {
});

it("Issuer is able to reclaim dividend after expiry", async () => {
let tokenOwnerBalance = BigNumber(await I_PolyToken.balanceOf(token_owner));
let tokenOwnerBalance = new BigNumber(await I_PolyToken.balanceOf(token_owner));
await I_ERC20DividendCheckpoint.reclaimDividend(3, { from: token_owner, gasPrice: 0 });
let tokenOwnerAfter = BigNumber(await I_PolyToken.balanceOf(token_owner));
let tokenOwnerAfter = new BigNumber(await I_PolyToken.balanceOf(token_owner));
assert.equal(tokenOwnerAfter.sub(tokenOwnerBalance).toNumber(), web3.utils.toWei("7", "ether"));
});

Expand Down
Loading