Skip to content

Commit f33e12a

Browse files
maxsam4maxsam4
committed
greenkeeper-fix
1 parent fbf9399 commit f33e12a

12 files changed

+2145
-897
lines changed

‎CLI/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"readline-sync": "^1.4.9",
1616
"request": "^2.88.0",
1717
"request-promise": "^4.2.2",
18-
"web3": "1.0.0-beta.36"
18+
"web3": "1.0.0-beta.34"
1919
}
2020
}

‎CLI/yarn.lock

Lines changed: 455 additions & 246 deletions
Large diffs are not rendered by default.

‎package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"babel-preset-stage-2": "6.24.1",
6161
"babel-preset-stage-3": "6.24.1",
6262
"babel-register": "6.26.0",
63-
"bignumber.js": "^8.0.1",
63+
"bignumber.js": "7.2.1",
6464
"chalk": "^2.4.1",
6565
"coveralls": "^3.0.1",
6666
"ethereumjs-testrpc": "^6.0.3",
@@ -74,7 +74,7 @@
7474
"solc": "^0.4.24",
7575
"truffle-contract": "^3.0.4",
7676
"truffle-hdwallet-provider-privkey": "^0.3.0",
77-
"web3": "1.0.0-beta.36"
77+
"web3": "1.0.0-beta.34"
7878
},
7979
"devDependencies": {
8080
"@soldoc/soldoc": "^0.4.3",
@@ -98,7 +98,9 @@
9898
},
9999
"greenkeeper": {
100100
"ignore": [
101-
"openzeppelin-solidity"
101+
"openzeppelin-solidity",
102+
"web3",
103+
"bignumber.js"
102104
]
103105
}
104106
}

‎test/b_capped_sto.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ contract("CappedSTO", accounts => {
470470
it("Should fundRaised value equal to the raised value in the funds receiver wallet", async () => {
471471
const newBalance = await web3.eth.getBalance(account_fundsReceiver);
472472
//console.log("WWWW",newBalance,await I_CappedSTO.fundsRaised.call(),balanceOfReceiver);
473-
let op = BigNumber(newBalance)
473+
let op = new BigNumber(newBalance)
474474
.minus(balanceOfReceiver)
475475
.toNumber();
476476
assert.equal(

‎test/c_checkpoints.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,10 @@ contract("Checkpoints", accounts => {
226226
let cps = [];
227227
let ts = [];
228228
for (let j = 0; j < 10; j++) {
229-
let balance1 = BigNumber(await I_SecurityToken.balanceOf(account_investor1));
230-
let balance2 = BigNumber(await I_SecurityToken.balanceOf(account_investor2));
231-
let balance3 = BigNumber(await I_SecurityToken.balanceOf(account_investor3));
232-
let totalSupply = BigNumber(await I_SecurityToken.totalSupply());
229+
let balance1 = new BigNumber(await I_SecurityToken.balanceOf(account_investor1));
230+
let balance2 = new BigNumber(await I_SecurityToken.balanceOf(account_investor2));
231+
let balance3 = new BigNumber(await I_SecurityToken.balanceOf(account_investor3));
232+
let totalSupply = new BigNumber(await I_SecurityToken.totalSupply());
233233
cps.push([balance1, balance2, balance3]);
234234
ts.push(totalSupply);
235235
console.log(
@@ -265,18 +265,18 @@ contract("Checkpoints", accounts => {
265265
receiver = account_investor3;
266266
}
267267
let m = Math.random();
268-
let amount = BigNumber(await I_SecurityToken.balanceOf(sender))
268+
let amount = new BigNumber(await I_SecurityToken.balanceOf(sender))
269269
.mul(Math.random().toFixed(10))
270270
.toFixed(0);
271271
if (m > 0.8) {
272272
console.log("Sending full balance");
273-
amount = BigNumber(await I_SecurityToken.balanceOf(sender));
273+
amount = new BigNumber(await I_SecurityToken.balanceOf(sender));
274274
}
275275
console.log("Sender: " + sender + " Receiver: " + receiver + " Amount: " + JSON.stringify(amount));
276276
await I_SecurityToken.transfer(receiver, amount, { from: sender });
277277
}
278278
if (Math.random() > 0.5) {
279-
let n = BigNumber(Math.random().toFixed(10))
279+
let n = new BigNumber(Math.random().toFixed(10))
280280
.mul(10 ** 17)
281281
.toFixed(0);
282282
let p = Math.random() * 3;
@@ -293,7 +293,7 @@ contract("Checkpoints", accounts => {
293293
await I_SecurityToken.mint(minter, n, { from: token_owner });
294294
}
295295
if (Math.random() > 0.5) {
296-
let n = BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
296+
let n = new BigNumber(Math.random().toFixed(10)).mul(10 ** 17);
297297
let p = Math.random() * 3;
298298
let r = Math.random() * 3;
299299
let burner;
@@ -304,7 +304,7 @@ contract("Checkpoints", accounts => {
304304
} else {
305305
burner = account_investor3;
306306
}
307-
let burnerBalance = BigNumber(await I_SecurityToken.balanceOf(burner));
307+
let burnerBalance = new BigNumber(await I_SecurityToken.balanceOf(burner));
308308
if (n.gt(burnerBalance.div(2))) {
309309
n = burnerBalance.div(2);
310310
}
@@ -314,10 +314,10 @@ contract("Checkpoints", accounts => {
314314
}
315315
console.log("Checking Interim...");
316316
for (let k = 0; k < cps.length; k++) {
317-
let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
318-
let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
319-
let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
320-
let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
317+
let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
318+
let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
319+
let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
320+
let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
321321
let balances = [balance1, balance2, balance3];
322322
console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
323323
assert.isTrue(totalSupply.eq(ts[k]));
@@ -330,10 +330,10 @@ contract("Checkpoints", accounts => {
330330
}
331331
console.log("Checking...");
332332
for (let k = 0; k < cps.length; k++) {
333-
let balance1 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
334-
let balance2 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
335-
let balance3 = BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
336-
let totalSupply = BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
333+
let balance1 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor1, k + 1));
334+
let balance2 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor2, k + 1));
335+
let balance3 = new BigNumber(await I_SecurityToken.balanceOfAt(account_investor3, k + 1));
336+
let totalSupply = new BigNumber(await I_SecurityToken.totalSupplyAt(k + 1));
337337
let balances = [balance1, balance2, balance3];
338338
console.log("Checking TotalSupply: " + totalSupply + " is " + ts[k] + " at checkpoint: " + (k + 1));
339339
assert.isTrue(totalSupply.eq(ts[k]));

‎test/e_erc20_dividends.js

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@ contract("ERC20DividendCheckpoint", accounts => {
353353
});
354354

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

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

534534
it("should issuer pushes remain", async () => {
535535
console.log((await I_ERC20DividendCheckpoint.dividends(2))[5].toNumber());
536-
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
537-
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
538-
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
539-
let investorTempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
536+
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
537+
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
538+
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
539+
let investorTempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
540540
await I_ERC20DividendCheckpoint.pushDividendPayment(2, 0, 10, { from: token_owner });
541-
let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
542-
let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
543-
let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
544-
let investorTempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
541+
let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
542+
let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
543+
let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
544+
let investorTempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
545545
assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
546546
assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), web3.utils.toWei("3", "ether"));
547547
assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -778,31 +778,31 @@ contract("ERC20DividendCheckpoint", accounts => {
778778
});
779779

780780
it("Investor 2 claims dividend", async () => {
781-
let investor1Balance = BigNumber(await I_PolyToken.balanceOf(account_investor1));
782-
let investor2Balance = BigNumber(await I_PolyToken.balanceOf(account_investor2));
783-
let investor3Balance = BigNumber(await I_PolyToken.balanceOf(account_investor3));
784-
let tempBalance = BigNumber(await web3.eth.getBalance(account_temp));
781+
let investor1Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
782+
let investor2Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
783+
let investor3Balance = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
784+
let tempBalance = new BigNumber(await web3.eth.getBalance(account_temp));
785785
await I_ERC20DividendCheckpoint.pullDividendPayment(3, { from: account_investor2, gasPrice: 0 });
786-
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
787-
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
788-
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
789-
let tempBalanceAfter1 = BigNumber(await web3.eth.getBalance(account_temp));
786+
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
787+
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
788+
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
789+
let tempBalanceAfter1 = new BigNumber(await web3.eth.getBalance(account_temp));
790790
assert.equal(investor1BalanceAfter1.sub(investor1Balance).toNumber(), 0);
791791
assert.equal(investor2BalanceAfter1.sub(investor2Balance).toNumber(), web3.utils.toWei("1.8", "ether"));
792792
assert.equal(investor3BalanceAfter1.sub(investor3Balance).toNumber(), 0);
793793
assert.equal(tempBalanceAfter1.sub(tempBalance).toNumber(), 0);
794794
});
795795

796796
it("Should issuer pushes temp investor - investor1 excluded", async () => {
797-
let investor1BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
798-
let investor2BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
799-
let investor3BalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
800-
let tempBalanceAfter1 = BigNumber(await I_PolyToken.balanceOf(account_temp));
797+
let investor1BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
798+
let investor2BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
799+
let investor3BalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
800+
let tempBalanceAfter1 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
801801
await I_ERC20DividendCheckpoint.pushDividendPaymentToAddresses(3, [account_temp, account_investor1], { from: token_owner });
802-
let investor1BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor1));
803-
let investor2BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor2));
804-
let investor3BalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_investor3));
805-
let tempBalanceAfter2 = BigNumber(await I_PolyToken.balanceOf(account_temp));
802+
let investor1BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor1));
803+
let investor2BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor2));
804+
let investor3BalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_investor3));
805+
let tempBalanceAfter2 = new BigNumber(await I_PolyToken.balanceOf(account_temp));
806806
assert.equal(investor1BalanceAfter2.sub(investor1BalanceAfter1).toNumber(), 0);
807807
assert.equal(investor2BalanceAfter2.sub(investor2BalanceAfter1).toNumber(), 0);
808808
assert.equal(investor3BalanceAfter2.sub(investor3BalanceAfter1).toNumber(), 0);
@@ -823,9 +823,9 @@ contract("ERC20DividendCheckpoint", accounts => {
823823
});
824824

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

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

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

0 commit comments

Comments
 (0)