From c66b680e0c062e403d61cc372a98a850320981aa Mon Sep 17 00:00:00 2001 From: perissology Date: Wed, 28 Mar 2018 15:32:02 -0700 Subject: [PATCH] added a few more tests --- package.json | 2 +- test/NormalOperation.js | 33 ++++- test/Vault.js | 4 +- yarn.lock | 321 ++++++++++++++++++++-------------------- 4 files changed, 191 insertions(+), 169 deletions(-) diff --git a/package.json b/package.json index 822565b..67f23c3 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "lerna": "^2.2.0", "mocha": "^3.5.0", "random-bytes": "^1.0.0", - "solcpiler": "https://github.com/perissology/solcpiler.git#b60ac51b", + "solcpiler": "https://github.com/perissology/solcpiler.git#9862d1f", "web3": "1.0.0-beta.31" }, "homepage": "https://github.com/Giveth/liquidpledging#readme", diff --git a/test/NormalOperation.js b/test/NormalOperation.js index dc7ee3b..090871f 100644 --- a/test/NormalOperation.js +++ b/test/NormalOperation.js @@ -389,8 +389,37 @@ describe('LiquidPledging test', function () { await liquidPledging.addProject(`ProjectLevel${i}`, '', adminProject1, ++nAdmins, 86400, 0, { from: adminProject1, $extraGas: 100000 }); } - assertFail( + await assertFail( liquidPledging.addProject('ProjectLevel21', '', adminProject1, ++nAdmins, 86400, 0, { from: adminProject1, gas: 4000000 }) ); - }) + }); + + it('should prevent donation to 0 receiverId', async () => { + await assertFail(liquidPledging.donate(1, 0, giver1Token.$address, 1, { from: giver1, gas: 6700000 })); + }); + + it('should prevent donation from 0 giverId', async () => { + await assertFail(liquidPledging.donate(0, 1, giver1Token.$address, 1, { from: giver1, gas: 6700000 })); + }); + + it('should donate on behalf of another addy', async () => { + const oldNPledges = await liquidPledging.numberOfPledges(); + const oldNAdmins = await liquidPledging.numberOfPledgeAdmins(); + const preGiver1Bal = await giver1Token.balanceOf(giver1); + await liquidPledging.addGiverAndDonate(1, accounts[8], giver1Token.$address, 11, { from: giver1, $extraGas: 200000 }); + const nPledges = await liquidPledging.numberOfPledges(); + assert.equal(utils.toDecimal(nPledges), utils.toDecimal(oldNPledges) + 1); + const nAdmins = await liquidPledging.numberOfPledgeAdmins(); + assert.equal(utils.toDecimal(nAdmins), utils.toDecimal(oldNAdmins) + 1); + const res = await liquidPledging.getPledgeAdmin(nAdmins); + assert.equal(res[0], 0); // Giver + assert.equal(res[1], accounts[8]); + assert.equal(res[2], ''); + assert.equal(res[3], ''); + assert.equal(res[4], 259200); // default to 3 day commitTime + const giver1Bal = await giver1Token.balanceOf(giver1); + assert.equal(new utils.BN(preGiver1Bal).subn(11).toString(), giver1Bal); + await printState(liquidPledgingState); + console.log(liquidPledging.$address); + }); }); diff --git a/test/Vault.js b/test/Vault.js index 7252290..3ee983b 100644 --- a/test/Vault.js +++ b/test/Vault.js @@ -101,7 +101,7 @@ describe('Vault test', function () { it('escapeFunds should send funds to escapeHatchDestination', async function () { const preBalance = await token.balanceOf(escapeHatchDestination); - assertFail(vault.escapeFunds(0x0, 1000, { from: escapeHatchCaller, gas: 1000000})); + await assertFail(vault.escapeFunds(0x0, 1000, { from: escapeHatchCaller, gas: 1000000})); await vault.escapeFunds(token.$address, 1000, { from: escapeHatchCaller, $extraGas: 200000 }); @@ -123,7 +123,7 @@ describe('Vault test', function () { // set permission for 2nd param (p.amount) <= 300 await acl.grantPermissionP(restrictedPaymentsConfirmer, vault.$address, await vault.CONFIRM_PAYMENT_ROLE(), ["0x010600000000000000000000000000000000000000000000000000000000012c"], {$extraGas: 200000}); - assertFail(vault.confirmPayment(1, { from: restrictedPaymentsConfirmer, gas: 4000000 })); + await assertFail(vault.confirmPayment(1, { from: restrictedPaymentsConfirmer, gas: 4000000 })); await vault.confirmPayment(0, { from: restrictedPaymentsConfirmer, $extraGas: 200000 }); }); }); diff --git a/yarn.lock b/yarn.lock index e38915f..e44b7cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -173,7 +173,7 @@ ansi-styles@^3.2.0: dependencies: color-convert "^1.9.0" -any-promise@^1.0.0, any-promise@^1.3.0: +any-promise@1.3.0, any-promise@^1.0.0, any-promise@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -864,10 +864,6 @@ big.js@^3.1.3: version "3.2.0" resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" -bignumber.js@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" - binary-extensions@^1.0.0: version "1.11.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" @@ -1592,10 +1588,6 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^3.1.4: - version "3.1.8" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.8.tgz#715f070bf6014f2ae992a98b3929258b713f08d5" - currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -2094,21 +2086,13 @@ eth-contract-class@0.0.6: dependencies: web3-core-promievent "^1.0.0-beta.21" -eth-contract-class@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/eth-contract-class/-/eth-contract-class-0.0.7.tgz#d3c46341a2255fb046165f2d763e28d1d040581e" +eth-contract-class@^0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/eth-contract-class/-/eth-contract-class-0.0.8.tgz#0ba4590e6185f156c08b7f44b0581fd8d6b7c5b0" dependencies: web3-core-promievent "^1.0.0-beta.21" -eth-lib@0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.7.tgz#2f93f17b1e23aec3759cd4a3fe20c1286a3fc1ca" - dependencies: - bn.js "^4.11.6" - elliptic "^6.4.0" - xhr-request-promise "^0.1.2" - -eth-lib@^0.1.26, eth-lib@^0.1.27: +eth-lib@0.1.27, eth-lib@^0.1.26, eth-lib@^0.1.27: version "0.1.27" resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.1.27.tgz#f0b0fd144f865d2d6bf8257a40004f2e75ca1dd6" dependencies: @@ -2120,6 +2104,14 @@ eth-lib@^0.1.26, eth-lib@^0.1.27: ws "^3.0.0" xhr-request-promise "^0.1.2" +eth-lib@0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/eth-lib/-/eth-lib-0.2.7.tgz#2f93f17b1e23aec3759cd4a3fe20c1286a3fc1ca" + dependencies: + bn.js "^4.11.6" + elliptic "^6.4.0" + xhr-request-promise "^0.1.2" + ethjs-unit@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-unit/-/ethjs-unit-0.1.6.tgz#c665921e476e87bce2a9d588a6fe0405b2c41699" @@ -4717,17 +4709,17 @@ solc@^0.4.19: semver "^5.3.0" yargs "^4.7.1" -solcpiler@^0.0.15: - version "0.0.15" - resolved "https://registry.yarnpkg.com/solcpiler/-/solcpiler-0.0.15.tgz#fee98c24937fca0eb602f8d6d99683c7d8bc2e87" +"solcpiler@https://github.com/perissology/solcpiler.git#9862d1f": + version "0.0.18" + resolved "https://github.com/perissology/solcpiler.git#9862d1f09a402f93b3ba159b6fbca0d5f6c5e93b" dependencies: app-root-path "^2.0.1" async "^2.5.0" - eth-contract-class "0.0.7" + eth-contract-class "^0.0.8" glob "^7.1.2" lodash "^4.17.4" solc "^0.4.19" - web3 "^0.19.1" + web3-utils "^1.0.0-beta.30" yargs "^8.0.2" solium@^0.5.5: @@ -5255,10 +5247,6 @@ utf8@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.1.tgz#2e01db02f7d8d0944f77104f1609eb0c304cf768" -utf8@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/utf8/-/utf8-2.1.2.tgz#1fa0d9270e9be850d9b05027f63519bf46457d96" - util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -5330,180 +5318,187 @@ wcwidth@^1.0.0: dependencies: defaults "^1.0.3" -web3-bzz@^1.0.0-beta.22: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.30.tgz#2434da183c239aaaa5c013f62307429ea91dd706" +web3-bzz@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.0.0-beta.31.tgz#aeba7c955861a99ba92dd1ca8f7c7a127832859d" dependencies: got "7.1.0" swarm-js "0.1.37" underscore "1.8.3" -web3-core-helpers@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.30.tgz#a000cee3f0a09eea13d74b5730335d4635fe1f2f" +web3-core-helpers@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.31.tgz#7044c8f3d3f735158ba1e66b84f6c4090882165c" dependencies: underscore "1.8.3" - web3-eth-iban "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-eth-iban "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-core-method@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.30.tgz#8dd6ff789e8d1563b8786d13a78c7facefae471c" +web3-core-method@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.31.tgz#21190b9b8cf1503513e838b0f4eef7260fee093b" dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" - web3-core-promievent "1.0.0-beta.30" - web3-core-subscriptions "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" + web3-core-promievent "1.0.0-beta.31" + web3-core-subscriptions "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-core-promievent@1.0.0-beta.30, web3-core-promievent@^1.0.0-beta.21: +web3-core-promievent@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.31.tgz#dda95be65ecd7924e300a5e98477c1bb0a57e8f3" + dependencies: + any-promise "1.3.0" + eventemitter3 "1.1.1" + +web3-core-promievent@^1.0.0-beta.21: version "1.0.0-beta.30" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.30.tgz#6205192bfb097441132226a5939ec5aed3a8a291" dependencies: bluebird "3.3.1" eventemitter3 "1.1.1" -web3-core-requestmanager@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.30.tgz#6ee56fb8a6cb85fd01b3080854f50d64e52240c6" +web3-core-requestmanager@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.31.tgz#4bf667b414d46e066d9930994f34f46fb408fbe7" dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" - web3-providers-http "1.0.0-beta.30" - web3-providers-ipc "1.0.0-beta.30" - web3-providers-ws "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" + web3-providers-http "1.0.0-beta.31" + web3-providers-ipc "1.0.0-beta.31" + web3-providers-ws "1.0.0-beta.31" -web3-core-subscriptions@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.30.tgz#31652c75356c3f67e5a19cd14b8d314bad4e2127" +web3-core-subscriptions@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.31.tgz#7e9006de20a8b0407ac1364ef56b87cfc4d0f24b" dependencies: eventemitter3 "1.1.1" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" -web3-core@1.0.0-beta.30, web3-core@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.30.tgz#f75f4d3b85be74c7674637921c3e013bc5d27679" +web3-core@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.31.tgz#abd149cc412c85365bf4d1197c749e3f50e3eaa1" dependencies: - web3-core-helpers "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-core-requestmanager "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-core-requestmanager "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-eth-abi@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.30.tgz#6ea52c999a8505b47c2f88ba61d2a680a1066409" +web3-eth-abi@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.31.tgz#c50e39edc20d16b4c359029e829b841394c72fc1" dependencies: bn.js "4.11.6" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-eth-accounts@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.30.tgz#8f0a1b342c4283812372242a6e2df268887b3b70" +web3-eth-accounts@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.31.tgz#3279bd0696d82bc4e152cc1d756c7be22d3192ad" dependencies: - bluebird "3.3.1" + any-promise "^1.3.0" crypto-browserify "^3.12.0" eth-lib "0.2.7" scrypt.js "0.2.0" underscore "1.8.3" uuid "2.0.1" - web3-core "1.0.0-beta.30" - web3-core-helpers "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-helpers "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-eth-contract@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.30.tgz#d7eba2385084dff3c75aac48235af2c8d2d6a258" +web3-eth-contract@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.31.tgz#27946433f91d8953013e2d97fd8b78a9ed6b6edc" dependencies: underscore "1.8.3" - web3-core "1.0.0-beta.30" - web3-core-helpers "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-core-promievent "1.0.0-beta.30" - web3-core-subscriptions "1.0.0-beta.30" - web3-eth-abi "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-helpers "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-core-promievent "1.0.0-beta.31" + web3-core-subscriptions "1.0.0-beta.31" + web3-eth-abi "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-eth-iban@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.30.tgz#3b080a5c4da1fa37477b17e4c900781b92150645" +web3-eth-iban@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.31.tgz#ed64bed333bb040a6f294fb4e9d18eaddbebffca" dependencies: bn.js "^4.11.6" - web3-utils "1.0.0-beta.30" + web3-utils "1.0.0-beta.31" -web3-eth-personal@1.0.0-beta.30, web3-eth-personal@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.30.tgz#8bd4ef40b3b5f841dd3a8b97873d9dc791caf748" +web3-eth-personal@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.31.tgz#2b0d6085920e9ddcdfbbadf20a715f0cc3771d80" dependencies: - web3-core "1.0.0-beta.30" - web3-core-helpers "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-net "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-helpers "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-net "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-eth@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.30.tgz#029b15e14cb608b9cfe02603b504d651870f0501" +web3-eth@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.31.tgz#b7b4b075534b3a3b0ab5b5697bd5085d79eb61c6" dependencies: underscore "1.8.3" - web3-core "1.0.0-beta.30" - web3-core-helpers "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-core-subscriptions "1.0.0-beta.30" - web3-eth-abi "1.0.0-beta.30" - web3-eth-accounts "1.0.0-beta.30" - web3-eth-contract "1.0.0-beta.30" - web3-eth-iban "1.0.0-beta.30" - web3-eth-personal "1.0.0-beta.30" - web3-net "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-helpers "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-core-subscriptions "1.0.0-beta.31" + web3-eth-abi "1.0.0-beta.31" + web3-eth-accounts "1.0.0-beta.31" + web3-eth-contract "1.0.0-beta.31" + web3-eth-iban "1.0.0-beta.31" + web3-eth-personal "1.0.0-beta.31" + web3-net "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-net@1.0.0-beta.30, web3-net@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.30.tgz#0a352ede296e6d4b7f88b67aa474e49703de73bf" +web3-net@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.31.tgz#d26bfca0ea1752f5fd5d72134e00e513ad1e7e19" dependencies: - web3-core "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-utils "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" -web3-providers-http@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.30.tgz#cda8d9133c6f31d1a812dc5a42af00cbea98cd86" +web3-providers-http@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.31.tgz#13409ef44ae1623cd5c4dcd3db4b08d6fbba4532" dependencies: - web3-core-helpers "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" xhr2 "0.1.4" -web3-providers-ipc@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.30.tgz#ee2d8d18a3f120b777044a56e67e0aee20854587" +web3-providers-ipc@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.31.tgz#ce6da670faa19458e622dfed9be400584fc33724" dependencies: oboe "2.1.3" underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" -web3-providers-ws@1.0.0-beta.30: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.30.tgz#9ae69a9ead8a8761f86379fa347b6db5ae44b12d" +web3-providers-ws@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.31.tgz#cc71b70e8d8b53201a533743707c30e8c099e28d" dependencies: underscore "1.8.3" - web3-core-helpers "1.0.0-beta.30" + web3-core-helpers "1.0.0-beta.31" websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible" -web3-shh@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.30.tgz#2bfe3220d958ff4ca592017790852bc57b7b0ca7" +web3-shh@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.31.tgz#016d204be2bba1b7f3b3915027219d274efe5e52" dependencies: - web3-core "1.0.0-beta.30" - web3-core-method "1.0.0-beta.30" - web3-core-subscriptions "1.0.0-beta.30" - web3-net "1.0.0-beta.30" + web3-core "1.0.0-beta.31" + web3-core-method "1.0.0-beta.31" + web3-core-subscriptions "1.0.0-beta.31" + web3-net "1.0.0-beta.31" -web3-utils@1.0.0-beta.30, web3-utils@^1.0.0-beta.24: - version "1.0.0-beta.30" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.30.tgz#eae408cc8d6d6fecc8d5097cfead51773f231ff9" +web3-utils@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.31.tgz#0f18125d3e9698ae82cbf6fa29adc1e1616f2936" dependencies: bn.js "4.11.6" eth-lib "^0.1.27" @@ -5513,27 +5508,29 @@ web3-utils@1.0.0-beta.30, web3-utils@^1.0.0-beta.24: underscore "1.8.3" utf8 "2.1.1" -web3@1.0.0-beta.24: - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.24.tgz#0b653d6a50f407b37f593371fb6ee1bd3a1f27c2" +web3-utils@^1.0.0-beta.30: + version "1.0.0-beta.33" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.33.tgz#e091b7994f09b714b0198a4057d3ad2eb8cbe238" dependencies: - web3-bzz "^1.0.0-beta.22" - web3-core "^1.0.0-beta.24" - web3-eth "^1.0.0-beta.24" - web3-eth-personal "^1.0.0-beta.24" - web3-net "^1.0.0-beta.24" - web3-shh "^1.0.0-beta.24" - web3-utils "^1.0.0-beta.24" + bn.js "4.11.6" + eth-lib "0.1.27" + ethjs-unit "0.1.6" + number-to-bn "1.7.0" + randomhex "0.1.5" + underscore "1.8.3" + utf8 "2.1.1" -web3@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-0.19.1.tgz#e763d5b1107c4bc24abd4f8cbee1ba3659e6eb31" +web3@1.0.0-beta.31: + version "1.0.0-beta.31" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.0.0-beta.31.tgz#c56239e5271407c982cb8584a9dfc81fdac47e36" dependencies: - bignumber.js "^4.0.2" - crypto-js "^3.1.4" - utf8 "^2.1.1" - xhr2 "*" - xmlhttprequest "*" + web3-bzz "1.0.0-beta.31" + web3-core "1.0.0-beta.31" + web3-eth "1.0.0-beta.31" + web3-eth-personal "1.0.0-beta.31" + web3-net "1.0.0-beta.31" + web3-shh "1.0.0-beta.31" + web3-utils "1.0.0-beta.31" webpack-sources@^1.0.1: version "1.1.0" @@ -5681,7 +5678,7 @@ xhr-request@^1.0.1: url-set-query "^1.0.0" xhr "^2.0.4" -xhr2@*, xhr2@0.1.4: +xhr2@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" @@ -5694,10 +5691,6 @@ xhr@^2.0.4, xhr@^2.3.3: parse-headers "^2.0.0" xtend "^4.0.0" -xmlhttprequest@*: - version "1.8.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" - xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"