diff --git a/package.json b/package.json index b6535b952b..28a41b051a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "devDependencies": { "babel-eslint": "10.0.3", + "bignumber.js": "5.0.0", "chalk": "2.4.2", "coveralls": "3.0.9", "eslint": "6.2.2", @@ -82,6 +83,7 @@ "embark-dapp-template-demo/bootstrap", "embark-dapp-test-app/embark-dapp-test-service", "embark-dapp-test-app/zeppelin-solidity", + "embark-ui/bignumber.js", "embark-ui/react-scripts", "embark-ui/react-scripts/**", "embark/embark-test-contract-0", diff --git a/packages/cockpit/ui/package.json b/packages/cockpit/ui/package.json index e35206a184..2a5a42421c 100644 --- a/packages/cockpit/ui/package.json +++ b/packages/cockpit/ui/package.json @@ -101,7 +101,7 @@ "typescript": "3.7.2", "uuid": "3.3.2", "velocity-react": "1.4.1", - "web3": "1.2.1", + "web3": "1.2.4", "webpack": "4.41.2" }, "eslintConfig": { diff --git a/packages/core/code-runner/package.json b/packages/core/code-runner/package.json index 39bdfaff41..da30892c4f 100644 --- a/packages/core/code-runner/package.json +++ b/packages/core/code-runner/package.json @@ -58,7 +58,7 @@ "fs-extra": "8.1.0", "parse-json": "4.0.0", "vm2": "3.6.4", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/core/core/package.json b/packages/core/core/package.json index 701d41b59f..e87df54e85 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -50,7 +50,6 @@ "dependencies": { "@babel/runtime-corejs3": "7.7.4", "@types/deep-equal": "1.0.1", - "@types/web3": "1.0.12", "colors": "1.3.2", "core-js": "3.4.3", "decompress": "4.2.0", @@ -67,6 +66,8 @@ "parse-json": "4.0.0", "shelljs": "0.8.3", "uuid": "3.3.2", + "web3": "1.2.4", + "web3-utils": "1.2.4", "window-size": "1.1.1" }, "devDependencies": { diff --git a/packages/core/core/src/index.ts b/packages/core/core/src/index.ts index 6a69ecec1e..ec2fd93f7f 100644 --- a/packages/core/core/src/index.ts +++ b/packages/core/core/src/index.ts @@ -2,10 +2,10 @@ export type Callback = (err?: Error | null, val?: Tv) => void; export type Maybe = false | 0 | undefined | null | T; -import { ABIDefinition } from 'web3/eth/abi'; +import { AbiItem } from "web3-utils"; export interface Contract { - abiDefinition: ABIDefinition[]; + abiDefinition: AbiItem[]; deployedAddress: string; className: string; silent?: boolean; diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index 8365b87fbd..5ff964d1df 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -69,9 +69,9 @@ "ora": "4.0.3", "pretty-ms": "5.0.0", "shelljs": "0.8.3", - "web3": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-abi": "1.2.1", + "web3": "1.2.4", + "web3-eth": "1.2.4", + "web3-eth-abi": "1.2.4", "ws": "7.1.2" }, "devDependencies": { diff --git a/packages/embark/package.json b/packages/embark/package.json index 6052528b9f..5588d9c1d5 100644 --- a/packages/embark/package.json +++ b/packages/embark/package.json @@ -91,6 +91,7 @@ "find-up": "2.1.0", "flatted": "0.2.3", "fs-extra": "8.1.0", + "ganache-cli": "6.7.0", "glob": "7.1.4", "globule": "1.2.1", "hosted-git-info": "2.7.1", @@ -119,25 +120,25 @@ "term.js": "0.0.7", "viz.js": "1.8.2", "vm2": "3.6.4", - "web3": "1.2.1", - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-accounts": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-eth-iban": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-providers-http": "1.2.1", - "web3-providers-ipc": "1.2.1", - "web3-providers-ws": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1", + "web3": "1.2.4", + "web3-bzz": "1.2.4", + "web3-core": "1.2.4", + "web3-core-helpers": "1.2.4", + "web3-core-method": "1.2.4", + "web3-core-promievent": "1.2.4", + "web3-core-subscriptions": "1.2.4", + "web3-eth": "1.2.4", + "web3-eth-abi": "1.2.4", + "web3-eth-accounts": "1.2.4", + "web3-eth-contract": "1.2.4", + "web3-eth-iban": "1.2.4", + "web3-eth-personal": "1.2.4", + "web3-net": "1.2.4", + "web3-providers-http": "1.2.4", + "web3-providers-ipc": "1.2.4", + "web3-providers-ws": "1.2.4", + "web3-shh": "1.2.4", + "web3-utils": "1.2.4", "window-size": "1.1.1" }, "devDependencies": { diff --git a/packages/embarkjs/embarkjs/package.json b/packages/embarkjs/embarkjs/package.json index ac8efcc13e..e3c332e070 100644 --- a/packages/embarkjs/embarkjs/package.json +++ b/packages/embarkjs/embarkjs/package.json @@ -79,7 +79,7 @@ "nyc": "13.1.0", "rimraf": "3.0.0", "source-map-support": "0.5.13", - "web3": "1.2.1" + "web3": "1.2.4" }, "engines": { "node": ">=10.17.0 <12.0.0", diff --git a/packages/embarkjs/embarkjs/src/lib/index.js b/packages/embarkjs/embarkjs/src/lib/index.js index a6971af3a0..04a15c0775 100644 --- a/packages/embarkjs/embarkjs/src/lib/index.js +++ b/packages/embarkjs/embarkjs/src/lib/index.js @@ -28,7 +28,7 @@ EmbarkJS.Contract = function() { throw new Error('EmbarkJS.Contract is deprecated: please use EmbarkJS.Blockchain.Contract instead'); }; EmbarkJS.isNewWeb3 = function() { - throw new Error('EmbarkJS.isNewWeb3 is deprecated: only Web3 >=1.2.1 is supported now'); + throw new Error('EmbarkJS.isNewWeb3 is deprecated: only Web3 >=1.2.4 is supported now'); }; export default EmbarkJS; diff --git a/packages/embarkjs/ens/package.json b/packages/embarkjs/ens/package.json index b4bad5cf9f..3817920571 100644 --- a/packages/embarkjs/ens/package.json +++ b/packages/embarkjs/ens/package.json @@ -51,7 +51,7 @@ "core-js": "3.4.3", "embarkjs": "^5.0.0-alpha.5", "eth-ens-namehash": "2.0.8", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "ajv": "6.10.2", diff --git a/packages/embarkjs/swarm/package.json b/packages/embarkjs/swarm/package.json index 254fac710c..965aca40a5 100644 --- a/packages/embarkjs/swarm/package.json +++ b/packages/embarkjs/swarm/package.json @@ -50,7 +50,7 @@ "@babel/runtime-corejs3": "7.7.4", "core-js": "3.4.3", "swarm-api": "0.1.2", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "ajv": "6.10.2", diff --git a/packages/embarkjs/web3/package.json b/packages/embarkjs/web3/package.json index df02c5a11b..ce79035a3e 100644 --- a/packages/embarkjs/web3/package.json +++ b/packages/embarkjs/web3/package.json @@ -49,7 +49,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.7.4", "core-js": "3.4.3", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "ajv": "6.10.2", diff --git a/packages/embarkjs/whisper/package.json b/packages/embarkjs/whisper/package.json index 64f822656c..6df240baec 100644 --- a/packages/embarkjs/whisper/package.json +++ b/packages/embarkjs/whisper/package.json @@ -50,7 +50,7 @@ "@babel/runtime-corejs3": "7.7.4", "core-js": "3.4.3", "rxjs": "6.4.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "ajv": "6.10.2", diff --git a/packages/plugins/accounts-manager/package.json b/packages/plugins/accounts-manager/package.json index 095489108b..3c99ccdcd2 100644 --- a/packages/plugins/accounts-manager/package.json +++ b/packages/plugins/accounts-manager/package.json @@ -52,7 +52,7 @@ "embark-i18n": "^5.0.0-alpha.5", "embark-logger": "^5.0.0-alpha.5", "embark-utils": "^5.0.0-alpha.8", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/accounts-manager/src/fundAccount.ts b/packages/plugins/accounts-manager/src/fundAccount.ts index 41fe862794..919d6c7da7 100644 --- a/packages/plugins/accounts-manager/src/fundAccount.ts +++ b/packages/plugins/accounts-manager/src/fundAccount.ts @@ -9,8 +9,7 @@ export default async function fundAccount(web3: Web3, accountAddress: string, co const targetBalance = web3.utils.toBN(hexBalance); // check if account is already funded - let accountBalance = await web3.eth.getBalance(accountAddress); - accountBalance = web3.utils.toBN(accountBalance); + const accountBalance = web3.utils.toBN(await web3.eth.getBalance(accountAddress)); if (accountBalance.gte(targetBalance)) { return; } diff --git a/packages/plugins/coverage/package.json b/packages/plugins/coverage/package.json index ab2f924dae..5b44fb5944 100644 --- a/packages/plugins/coverage/package.json +++ b/packages/plugins/coverage/package.json @@ -49,7 +49,6 @@ "@types/mocha": "5.2.7", "@types/prettier": "1.16.4", "@types/semver": "5.5.0", - "@types/web3": "1.0.12", "core-js": "3.4.3", "embark-core": "^5.0.0-alpha.8", "embark-utils": "^5.0.0-alpha.8", @@ -58,7 +57,8 @@ "prettier-plugin-solidity": "1.0.0-alpha.25", "semver": "5.6.0", "solidity-parser-antlr": "0.4.5", - "web3-eth-contract": "1.2.1" + "web3-core": "1.2.4", + "web3-eth-contract": "1.2.4" }, "devDependencies": { "@babel/cli": "7.7.4", diff --git a/packages/plugins/coverage/src/lib/contractEnhanced.ts b/packages/plugins/coverage/src/lib/contractEnhanced.ts index b1fa6c2a36..35536695af 100644 --- a/packages/plugins/coverage/src/lib/contractEnhanced.ts +++ b/packages/plugins/coverage/src/lib/contractEnhanced.ts @@ -2,7 +2,7 @@ import {File} from "embark-utils"; import * as fs from "fs-extra"; import * as path from "path"; import parser, {LineColumn, Location, SourceUnit} from "solidity-parser-antlr"; -import {EventLog} from "web3/types"; +import {EventLog} from "web3-core"; import {decrypt} from "./eventId"; import {Injector} from "./injector"; diff --git a/packages/plugins/coverage/src/lib/index.ts b/packages/plugins/coverage/src/lib/index.ts index 01449e44c7..5430ff7663 100644 --- a/packages/plugins/coverage/src/lib/index.ts +++ b/packages/plugins/coverage/src/lib/index.ts @@ -2,7 +2,7 @@ import { Contract, Embark } from "embark-core"; import { dappPath, File } from "embark-utils"; import * as globule from "globule"; import * as path from "path"; -import Web3Contract from "web3/eth/contract"; +import { Contract as Web3Contract } from "web3-eth-contract"; import { ContractEnhanced } from "./contractEnhanced"; import { coverageContractsPath } from "./path"; diff --git a/packages/plugins/deploy-tracker/package.json b/packages/plugins/deploy-tracker/package.json index 0d22654593..24efcd7391 100644 --- a/packages/plugins/deploy-tracker/package.json +++ b/packages/plugins/deploy-tracker/package.json @@ -49,7 +49,7 @@ "embark-logger": "^5.0.0-alpha.5", "embark-utils": "^5.0.0-alpha.8", "fs-extra": "8.1.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/ens/package.json b/packages/plugins/ens/package.json index 597fa36d7d..f12f51c927 100644 --- a/packages/plugins/ens/package.json +++ b/packages/plugins/ens/package.json @@ -53,7 +53,7 @@ "embarkjs-ens": "^5.0.0-alpha.6", "eth-ens-namehash": "2.0.8", "lodash.clonedeep": "4.5.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "@babel/core": "7.7.4", diff --git a/packages/plugins/ethereum-blockchain-client/package.json b/packages/plugins/ethereum-blockchain-client/package.json index 5406784888..2a77394338 100644 --- a/packages/plugins/ethereum-blockchain-client/package.json +++ b/packages/plugins/ethereum-blockchain-client/package.json @@ -52,8 +52,8 @@ "embark-utils": "^5.0.0-alpha.8", "embarkjs": "^5.0.0-alpha.5", "ethereumjs-util": "6.0.0", - "web3": "1.2.1", - "web3-core-requestmanager": "1.2.1" + "web3": "1.2.4", + "web3-core-requestmanager": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/ganache/package.json b/packages/plugins/ganache/package.json index 81eefffa8d..3458183cbe 100644 --- a/packages/plugins/ganache/package.json +++ b/packages/plugins/ganache/package.json @@ -46,7 +46,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.7.4", "core-js": "3.4.3", - "ganache-cli": "6.4.3" + "ganache-cli": "6.7.0" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/geth/package.json b/packages/plugins/geth/package.json index 6c9370c4e3..3f8b8dc47f 100644 --- a/packages/plugins/geth/package.json +++ b/packages/plugins/geth/package.json @@ -56,7 +56,7 @@ "fs-extra": "8.1.0", "netcat": "1.3.5", "semver": "5.6.0", - "web3": "1.2.1", + "web3": "1.2.4", "ws": "7.1.2" }, "devDependencies": { diff --git a/packages/plugins/geth/src/devtxs.ts b/packages/plugins/geth/src/devtxs.ts index 3d9261b2bc..89044df600 100644 --- a/packages/plugins/geth/src/devtxs.ts +++ b/packages/plugins/geth/src/devtxs.ts @@ -75,7 +75,9 @@ export default class DevTxs { if (!this.web3) { return; } - return this.web3.eth.sendTransaction({ value: "0", to: this.web3.eth.defaultAccount, from: this.web3.eth.defaultAccount }); + const to = this.web3.eth.defaultAccount || undefined; + const from = this.web3.eth.defaultAccount || undefined; + return this.web3.eth.sendTransaction({ value: "0", to, from }); } public async startRegularTxs() { diff --git a/packages/plugins/mocha-tests/package.json b/packages/plugins/mocha-tests/package.json index ca29de8f93..cc90ce3808 100644 --- a/packages/plugins/mocha-tests/package.json +++ b/packages/plugins/mocha-tests/package.json @@ -55,7 +55,7 @@ "embark-utils": "^5.0.0-alpha.8", "embarkjs": "^5.0.0-alpha.5", "mocha": "6.2.2", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/parity/src/parityClient.js b/packages/plugins/parity/src/parityClient.js index a391fa8038..ddc2fdafb5 100644 --- a/packages/plugins/parity/src/parityClient.js +++ b/packages/plugins/parity/src/parityClient.js @@ -9,7 +9,7 @@ const constants = require('embark-core/constants'); const DEFAULTS = { "BIN": "parity", - "VERSIONS_SUPPORTED": ">=2.0.0", + "VERSIONS_SUPPORTED": ">=2.2.1", "NETWORK_TYPE": "dev", "NETWORK_ID": 17, "RPC_API": ["web3", "eth", "pubsub", "net", "parity", "private", "parity_pubsub", "traces", "rpc", "shh", "shh_pubsub"], diff --git a/packages/plugins/profiler/package.json b/packages/plugins/profiler/package.json index 532047fb22..ba0aa2b408 100644 --- a/packages/plugins/profiler/package.json +++ b/packages/plugins/profiler/package.json @@ -48,8 +48,8 @@ "ascii-table": "0.0.9", "async": "2.6.1", "core-js": "3.4.3", - "web3": "1.2.1", - "web3-utils": "1.2.1" + "web3": "1.2.4", + "web3-utils": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/rpc-manager/package.json b/packages/plugins/rpc-manager/package.json index 8cb442188f..1ad2d1f454 100644 --- a/packages/plugins/rpc-manager/package.json +++ b/packages/plugins/rpc-manager/package.json @@ -53,7 +53,7 @@ "embark-i18n": "^5.0.0-alpha.5", "embark-logger": "^5.0.0-alpha.5", "embark-utils": "^5.0.0-alpha.8", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "cross-env": "5.2.0", diff --git a/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts b/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts index 402a503a53..a72d3a058e 100644 --- a/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts +++ b/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts @@ -24,19 +24,19 @@ export default class EthSendTransaction extends RpcModifier { } payload.nonce = newNonce; const web3 = await this.web3; - web3.eth.accounts.signTransaction(payload, account.privateKey, (signingError: any, result: any) => { - if (signingError) { - return callback(signingError, null); - } + try { + const result = await web3.eth.accounts.signTransaction(payload, account.privateKey); callback(null, result.rawTransaction); - }); + } catch (err) { + callback(err); + } }); }, 1); } private async getNonce(address: string, callback: Callback) { const web3 = await this.web3; - web3.eth.getTransactionCount(address, undefined, (error: any, transactionCount: number) => { + web3.eth.getTransactionCount(address, (error: any, transactionCount: number) => { if (error) { return callback(error, null); } diff --git a/packages/plugins/scaffolding/package.json b/packages/plugins/scaffolding/package.json index 3fae679f95..d8925c3efe 100644 --- a/packages/plugins/scaffolding/package.json +++ b/packages/plugins/scaffolding/package.json @@ -49,7 +49,8 @@ "embark-i18n": "^5.0.0-alpha.5", "embark-logger": "^5.0.0-alpha.5", "embark-utils": "^5.0.0-alpha.8", - "handlebars": "4.2.0" + "handlebars": "4.2.0", + "web3-utils": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts b/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts index cedf4bbead..fc3859e9ee 100644 --- a/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts +++ b/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts @@ -2,7 +2,7 @@ import { Contract, Embark } from "embark-core"; import { __ } from "embark-i18n"; import Handlebars from "handlebars"; import * as path from "path"; -import { ABIDefinition } from "web3/eth/abi"; +import { AbiItem } from "web3-utils"; import { Builder } from "../../builder"; import { CommandOptions } from "../../commandOptions"; import { SmartContractsRecipe } from "../../smartContractsRecipe"; @@ -10,7 +10,7 @@ import { SmartContractsRecipe } from "../../smartContractsRecipe"; const utils = require("embark-utils"); require("../../handlebarHelpers"); -interface ABIDefinitionDecorated extends ABIDefinition { +interface AbiItemDecorated extends AbiItem { isIpfsText?: boolean; isIpfsFile?: boolean; isStandard?: boolean; @@ -82,7 +82,7 @@ export class ReactBuilder implements Builder { const ipfsAttributes = this.description.ipfsAttributes(contract.className); return contract.abiDefinition.filter((entry) => entry.type === "function").map((entry) => { - const decorated: ABIDefinitionDecorated = entry; + const decorated: AbiItemDecorated = entry; const inputName = entry.inputs && entry.inputs.length > 1 ? entry.inputs[1].name.substring(1, entry.inputs[1].name.length) : ""; const functionName = entry.name || ""; diff --git a/packages/plugins/scaffolding/src/handlebarHelpers.ts b/packages/plugins/scaffolding/src/handlebarHelpers.ts index a4cca40ad1..5abfb21a95 100644 --- a/packages/plugins/scaffolding/src/handlebarHelpers.ts +++ b/packages/plugins/scaffolding/src/handlebarHelpers.ts @@ -1,5 +1,5 @@ import Handlebars from "handlebars"; -import { ABIDefinition } from "web3/eth/abi"; +import { AbiItem } from "web3-utils"; Handlebars.registerHelper("capitalize", (word: string) => { return word.charAt(0).toUpperCase() + word.slice(1); @@ -53,7 +53,7 @@ Handlebars.registerHelper("trim", (name: string) => { return name.replace("[]", ""); }); -Handlebars.registerHelper("methodname", (abiDefinition: ABIDefinition[], functionName: string, inputs: any[]) => { +Handlebars.registerHelper("methodname", (abiDefinition: AbiItem[], functionName: string, inputs: any[]) => { const funCount = abiDefinition.filter((x) => x.name === functionName).length; if (funCount === 1) { return "." + functionName; diff --git a/packages/plugins/solidity-tests/package.json b/packages/plugins/solidity-tests/package.json index 41842fb42b..0c11d55ee7 100644 --- a/packages/plugins/solidity-tests/package.json +++ b/packages/plugins/solidity-tests/package.json @@ -27,7 +27,11 @@ "types": "./dist/lib/index.d.ts", "embark-collective": { "build:node": true, - "typecheck": true + "typecheck": { + "compilerOptions": { + "skipLibCheck": true + } + } }, "scripts": { "_build": "npm run solo -- build", @@ -50,7 +54,7 @@ "core-js": "3.4.3", "embark-utils": "^5.0.0-alpha.8", "remix-tests": "0.1.20", - "web3": "1.2.1", + "web3": "1.2.4", "yo-yoify": "4.3.0" }, "devDependencies": { diff --git a/packages/plugins/solidity-tests/tsconfig.json b/packages/plugins/solidity-tests/tsconfig.json index d7e4a88e60..57aeeaeb46 100644 --- a/packages/plugins/solidity-tests/tsconfig.json +++ b/packages/plugins/solidity-tests/tsconfig.json @@ -3,6 +3,7 @@ "composite": true, "declarationDir": "./dist", "rootDir": "./src", + "skipLibCheck": true, "tsBuildInfoFile": "./node_modules/.cache/tsc/tsconfig.embark-solidity-tests.tsbuildinfo" }, "extends": "../../../tsconfig.base.json", diff --git a/packages/plugins/transaction-logger/package.json b/packages/plugins/transaction-logger/package.json index 73d803c2b4..95982dbdc3 100644 --- a/packages/plugins/transaction-logger/package.json +++ b/packages/plugins/transaction-logger/package.json @@ -47,7 +47,6 @@ }, "dependencies": { "@babel/runtime-corejs3": "7.7.4", - "@types/web3": "1.0.12", "async": "2.6.1", "core-js": "3.4.3", "embark-core": "^5.0.0-alpha.8", @@ -55,7 +54,8 @@ "embark-utils": "^5.0.0-alpha.8", "ethereumjs-tx": "1.3.7", "ethereumjs-util": "6.0.0", - "web3": "1.2.1" + "web3": "1.2.4", + "web3-utils": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/plugins/transaction-logger/src/transactionUtils.ts b/packages/plugins/transaction-logger/src/transactionUtils.ts index 8559a07650..88d0c50a9e 100644 --- a/packages/plugins/transaction-logger/src/transactionUtils.ts +++ b/packages/plugins/transaction-logger/src/transactionUtils.ts @@ -1,6 +1,6 @@ import { Contract } from "embark-core"; import { decodeParams, sha3 } from "embark-utils"; -import { ABIDefinition } from "web3/eth/abi"; +import { AbiItem } from "web3-utils"; interface AddressToContract { name: string; @@ -13,7 +13,7 @@ interface AddressToContractArray { } interface FunctionSignature { - abi: ABIDefinition; + abi: AbiItem; functionName?: string; name: string; } @@ -33,8 +33,8 @@ export function getAddressToContract(contractsList: Contract[], addressToContrac } const funcSignatures: { [name: string]: FunctionSignature } = {}; contract.abiDefinition - .filter((func: ABIDefinition) => func.type === "function") - .map((func: ABIDefinition) => { + .filter((func: AbiItem) => func.type === "function") + .map((func: AbiItem) => { const name = `${func.name}(${func.inputs ? func.inputs.map((input) => input.type).join(",") : ""})`; funcSignatures[sha3(name).substring(0, 10)] = { abi: func, diff --git a/packages/plugins/whisper-geth/package.json b/packages/plugins/whisper-geth/package.json index f1a272f755..9e00e17d12 100644 --- a/packages/plugins/whisper-geth/package.json +++ b/packages/plugins/whisper-geth/package.json @@ -58,7 +58,7 @@ "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "engines": { "node": ">=10.17.0 <12.0.0", diff --git a/packages/plugins/whisper-parity/package.json b/packages/plugins/whisper-parity/package.json index b5737c3ccf..6aacbd273e 100644 --- a/packages/plugins/whisper-parity/package.json +++ b/packages/plugins/whisper-parity/package.json @@ -58,7 +58,7 @@ "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "engines": { "node": ">=10.17.0 <12.0.0", diff --git a/packages/stack/blockchain-client/package.json b/packages/stack/blockchain-client/package.json index db431391db..e2acb0774e 100644 --- a/packages/stack/blockchain-client/package.json +++ b/packages/stack/blockchain-client/package.json @@ -46,7 +46,7 @@ "dependencies": { "@babel/runtime-corejs3": "7.7.4", "core-js": "3.4.3", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/stack/contracts-manager/package.json b/packages/stack/contracts-manager/package.json index f74eef3b20..e04662ce9e 100644 --- a/packages/stack/contracts-manager/package.json +++ b/packages/stack/contracts-manager/package.json @@ -54,7 +54,8 @@ "embark-i18n": "^5.0.0-alpha.5", "embark-logger": "^5.0.0-alpha.5", "embark-utils": "^5.0.0-alpha.8", - "web3": "1.2.1" + "web3": "1.2.4", + "web3-utils": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/stack/contracts-manager/src/contract.ts b/packages/stack/contracts-manager/src/contract.ts index 45d81d0fdf..60a047bd9a 100644 --- a/packages/stack/contracts-manager/src/contract.ts +++ b/packages/stack/contracts-manager/src/contract.ts @@ -1,11 +1,11 @@ import { ContractConfig } from "embark-core"; import { Logger } from 'embark-logger'; -const { sha3 } = require("embark-utils"); -import { ABIDefinition } from "web3/eth/abi"; +import { sha3 } from "embark-utils"; +import { AbiItem } from "web3-utils"; export default class Contract { private logger: Logger; - public abiDefinition?: ABIDefinition[]; + public abiDefinition?: AbiItem[]; public deployedAddress?: string; public className: string = ""; public address?: string; diff --git a/packages/stack/library-manager/package.json b/packages/stack/library-manager/package.json index ce1359ba11..c3eddc689f 100644 --- a/packages/stack/library-manager/package.json +++ b/packages/stack/library-manager/package.json @@ -57,7 +57,7 @@ "eslint": "5.7.0", "npm-run-all": "4.1.5", "rimraf": "3.0.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "engines": { "node": ">=10.17.0 <12.0.0", diff --git a/packages/stack/proxy/package.json b/packages/stack/proxy/package.json index 1cc1ae7b7c..1c361b461e 100644 --- a/packages/stack/proxy/package.json +++ b/packages/stack/proxy/package.json @@ -57,8 +57,8 @@ "embark-utils": "^5.0.0-alpha.8", "express": "4.17.1", "express-ws": "4.0.0", - "web3-core-requestmanager": "1.2.1", - "web3-providers-ws": "1.2.1" + "web3-core-requestmanager": "1.2.4", + "web3-providers-ws": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/packages/stack/test-runner/package.json b/packages/stack/test-runner/package.json index 7e3dba3e2a..4e898295d5 100644 --- a/packages/stack/test-runner/package.json +++ b/packages/stack/test-runner/package.json @@ -62,7 +62,7 @@ "istanbul-reports": "2.2.4", "mocha": "6.2.2", "open": "6.4.0", - "web3": "1.2.1" + "web3": "1.2.4" }, "devDependencies": { "embark-solo": "^5.0.0-alpha.5", diff --git a/site/source/docs/installing_embarkjs.md b/site/source/docs/installing_embarkjs.md index 0e4fff5309..13af1c581e 100644 --- a/site/source/docs/installing_embarkjs.md +++ b/site/source/docs/installing_embarkjs.md @@ -90,7 +90,7 @@ This will request account access and if the user grants access to his accounts, ### Components -* [EmbarkJS.Contract](contracts_javascript.html) - To interact with smart contracts. Typically Embark automatically initializes all your deployed contracts with this. uses web3.js 1.2.1 +* [EmbarkJS.Contract](contracts_javascript.html) - To interact with smart contracts. Typically Embark automatically initializes all your deployed contracts with this. uses web3.js 1.2.4 * [EmbarkJS.Storage](storage_javascript.html) - To interact with the configured decentralized storage. Includes bindings to save & retrieve data, upload & download files, etc.. * [EmbarkJS.Communication](messages_javascript.html) - To interact with the configured decentralized messages system. Includes bindings to listen to topics and send messages. * [EmbarkJS.Names](naming_javascript.html) - To interact with the configured decentralized naming system such as ENS. Includes bindings to look up the address of a domain name as well as retrieve a domain name given an address. diff --git a/site/source/docs/javascript_usage.md b/site/source/docs/javascript_usage.md index 2e8e0491a0..db038aeb58 100644 --- a/site/source/docs/javascript_usage.md +++ b/site/source/docs/javascript_usage.md @@ -60,7 +60,7 @@ In the case of the Smart Contract config `dappConnection`, the one that is used - This let's you use you own accounts, as set up in your Blockchain config's `accounts` section - If you don't use custom accounts, using `$EMBARK` is still useful, because it connects to the node more easily for you and uses the unlocked accounts on the node, like when using the `dev` `miningMode` - Also, Embark gets to see the transactions processed and logs them back to you in a human readable manner - + If you want, you can also put a valid node URL in the `dappConnection` array. In that case, EmbarkJS will connect directly to the node, without using Embark's proxy. It is, however, not recommended as you lose some of Embark's features, like the transaction logger. @@ -101,7 +101,7 @@ try { This guide only touched on getting started with EmbarkJS. There are many more APIs to explore, depending on what we're achieving to build. Have a look at the dedicated guides to learn more: -* [EmbarkJS.Contract](contracts_javascript.html) - To interact with smart contracts. Typically Embark automatically initializes all your deployed contracts with this. uses web3.js 1.2.1 +* [EmbarkJS.Contract](contracts_javascript.html) - To interact with smart contracts. Typically Embark automatically initializes all your deployed contracts with this. uses web3.js 1.2.4 * [EmbarkJS.Storage](storage_javascript.html) - To interact with the configured decentralized storage. Includes bindings to save & retrieve data, upload & download files, etc.. * [EmbarkJS.Communication](messages_javascript.html) - To interact with the configured decentralized messages system. Includes bindings to listen to topics and send messages. * [EmbarkJS.Names](naming_javascript.html) - To interact with the configured decentralized naming system such as ENS. Includes bindings to look up the address of a domain name as well as retrieve a domain name given an address. diff --git a/site/source/docs/smart_contract_objects.md b/site/source/docs/smart_contract_objects.md index a60f44ac86..8d5a2793ad 100644 --- a/site/source/docs/smart_contract_objects.md +++ b/site/source/docs/smart_contract_objects.md @@ -36,4 +36,4 @@ SimpleStorage.methods.get().call().then(function(value) { console.log(value) }); SimpleStorage.methods.storedData().call().then(function(value) { console.log(value) }); ``` -The syntax used is web3.js 1.2.1 +The syntax used is web3.js 1.2.4 diff --git a/site/source/docs/web3js.md b/site/source/docs/web3js.md index 7eecd35a56..7ee7e2c450 100644 --- a/site/source/docs/web3js.md +++ b/site/source/docs/web3js.md @@ -1,4 +1,4 @@ title: Web3.js Documentation --- -The documentation for Web3.js can be found [here](https://web3js.readthedocs.io/en/v1.2.1/) +The documentation for Web3.js can be found [here](https://web3js.readthedocs.io/en/v1.2.4/) diff --git a/yarn.lock b/yarn.lock index d147abd8dd..1e76f10727 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3794,7 +3794,14 @@ dependencies: "@babel/types" "^7.3.0" -"@types/bn.js@*", "@types/bn.js@^4.11.4": +"@types/bignumber.js@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/bignumber.js/-/bignumber.js-5.0.0.tgz#d9f1a378509f3010a3255e9cc822ad0eeb4ab969" + integrity sha512-0DH7aPGCClywOFaxxjE6UwpN2kQYe9LwuDQMv+zYA97j5GkOMo8e66LYT+a8JYU7jfmUFRZLa9KycxHDsKXJCA== + dependencies: + bignumber.js "*" + +"@types/bn.js@^4.11.4": version "4.11.5" resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-4.11.5.tgz#40e36197433f78f807524ec623afcf0169ac81dc" integrity sha512-AEAZcIZga0JgVMHNtl1CprA/hXX7/wPt79AgR4XqaDt7jyj3QWYw6LPoOiznPtugDmlubUnAahMs2PFxGcQrng== @@ -4079,19 +4086,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== -"@types/underscore@*": - version "1.9.4" - resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.9.4.tgz#22d1a3e6b494608e430221ec085fa0b7ccee7f33" - integrity sha512-CjHWEMECc2/UxOZh0kpiz3lEyX2Px3rQS9HzD20lxMvx571ivOBQKeLnqEjxUY0BMgp6WJWo/pQLRBwMW5v4WQ== - -"@types/web3@1.0.12": - version "1.0.12" - resolved "https://registry.yarnpkg.com/@types/web3/-/web3-1.0.12.tgz#dd7867ca24040b89577a20b7b07ad662de49c2c0" - integrity sha512-CZDwP4Opy2BjWfux+o05DXG0SSIyj7BQt7kYR+M8a8f/wTjJgre1JEECYUQ8Yu9NQg4yX4g7BjW2/Bd1KbZHOg== - dependencies: - "@types/bn.js" "*" - "@types/underscore" "*" - "@types/webpack-env@^1.13.7": version "1.14.1" resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.14.1.tgz#0d8a53f308f017c53a5ddc3d07f4d6fa76b790d7" @@ -4156,6 +4150,25 @@ lodash.unescape "4.0.1" semver "^6.3.0" +"@web3-js/scrypt-shim@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@web3-js/scrypt-shim/-/scrypt-shim-0.1.0.tgz#0bf7529ab6788311d3e07586f7d89107c3bea2cc" + integrity sha512-ZtZeWCc/s0nMcdx/+rZwY1EcuRdemOK9ag21ty9UsHkFxsNb/AaoucUz0iPuyGe0Ku+PFuRmWZG7Z7462p9xPw== + dependencies: + scryptsy "^2.1.0" + semver "^6.3.0" + +"@web3-js/websocket@^1.0.29": + version "1.0.30" + resolved "https://registry.yarnpkg.com/@web3-js/websocket/-/websocket-1.0.30.tgz#9ea15b7b582cf3bf3e8bc1f4d3d54c0731a87f87" + integrity sha512-fDwrD47MiDrzcJdSeTLF75aCcxVVt8B1N74rA+vh2XCAvFy4tEWJjtnUtj2QG7/zlQ6g9cQ88bZFBxwd9/FmtA== + dependencies: + debug "^2.2.0" + es5-ext "^0.10.50" + nan "^2.14.0" + typedarray-to-buffer "^3.1.5" + yaeti "^0.0.6" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -5616,21 +5629,26 @@ big.js@^5.2.2: resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== +bignumber.js@*, bignumber.js@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" + integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== + bignumber.js@2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.0.7.tgz#86eb0707cf6a5110909d23e6ea7434c14f500f1c" integrity sha1-husHB89qURCQnSPm6nQ0wU9QDxw= +bignumber.js@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-5.0.0.tgz#fbce63f09776b3000a83185badcde525daf34833" + integrity sha512-KWTu6ZMVk9sxlDJQh2YH1UOnfDP8O8TpxUxgQG/vKASoSnEjK9aVuOueFaPcQEYQ5fyNXNTOYwYw3099RYebWg== + bignumber.js@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8" integrity sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg= -bignumber.js@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" - integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== - "bignumber.js@git+https://github.com/frozeman/bignumber.js-nolookahead.git": version "2.0.7" resolved "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" @@ -9298,6 +9316,19 @@ ethereumjs-util@6.0.0, ethereumjs-util@~6.0.0: safe-buffer "^5.1.1" secp256k1 "^3.0.1" +ethereumjs-util@6.1.0, ethereumjs-util@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz#e9c51e5549e8ebd757a339cc00f5380507e799c8" + integrity sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q== + dependencies: + bn.js "^4.11.0" + create-hash "^1.1.2" + ethjs-util "0.1.6" + keccak "^1.0.2" + rlp "^2.0.0" + safe-buffer "^5.1.1" + secp256k1 "^3.0.1" + ethereumjs-util@^4.0.1, ethereumjs-util@^4.3.0, ethereumjs-util@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6" @@ -9322,19 +9353,6 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereum safe-buffer "^5.1.1" secp256k1 "^3.0.1" -ethereumjs-util@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz#e9c51e5549e8ebd757a339cc00f5380507e799c8" - integrity sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q== - dependencies: - bn.js "^4.11.0" - create-hash "^1.1.2" - ethjs-util "0.1.6" - keccak "^1.0.2" - rlp "^2.0.0" - safe-buffer "^5.1.1" - secp256k1 "^3.0.1" - ethereumjs-vm@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.4.0.tgz#244f1e35f2755e537a13546111d1a4c159d34b13" @@ -10393,14 +10411,14 @@ fuzzy@0.1.3: resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8" integrity sha1-THbsL/CsGjap3M+aAN+GIweNTtg= -ganache-cli@6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/ganache-cli/-/ganache-cli-6.4.3.tgz#2fb66c10f9df157b2cd9aeaf007a9fd47cd79cb1" - integrity sha512-3G+CK4ojipDvxQHlpX8PjqaOMRWVcaLZZSW97Bv7fdcPTXQwkji2yY5CY6J12Atiub4M4aJc0va+q3HXeerbIA== +ganache-cli@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/ganache-cli/-/ganache-cli-6.7.0.tgz#b59845578221bdf686cf124d007c5ee62e85a62f" + integrity sha512-9CZsClo9hl5MxGL7hkk14mie89Q94P0idh92jcV7LmppTYTCG7SHatuwcfqN7emFHArMt3fneN4QbH2do2N6Ow== dependencies: - bn.js "4.11.8" - source-map-support "0.5.9" - yargs "11.1.0" + ethereumjs-util "6.1.0" + source-map-support "0.5.12" + yargs "13.2.4" gauge@~2.7.3: version "2.7.4" @@ -15531,7 +15549,7 @@ os-locale@^2.0.0: lcid "^1.0.0" mem "^1.1.0" -os-locale@^3.0.0: +os-locale@^3.0.0, os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== @@ -18944,11 +18962,6 @@ scrypt@^6.0.2: dependencies: nan "^2.0.8" -scryptsy@2.1.0, scryptsy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" - integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== - scryptsy@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-1.2.1.tgz#a3225fa4b2524f802700761e2855bdf3b2d92163" @@ -18956,6 +18969,11 @@ scryptsy@^1.2.1: dependencies: pbkdf2 "^3.0.3" +scryptsy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790" + integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w== + scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" @@ -19027,11 +19045,6 @@ semver@5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" - integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A== - semver@6.3.0, semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -19604,18 +19617,18 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@0.5.13, source-map-support@^0.5.6, source-map-support@~0.5.12: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== +source-map-support@0.5.12: + version "0.5.12" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" + integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@0.5.9: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" - integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== +source-map-support@0.5.13, source-map-support@^0.5.6, source-map-support@~0.5.12: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -21407,19 +21420,20 @@ web3-bzz@1.0.0-beta.36: swarm-js "0.1.37" underscore "1.8.3" -web3-bzz@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.1.tgz#c3bd1e8f0c02a13cd6d4e3c3e9e1713f144f6f0d" - integrity sha512-LdOO44TuYbGIPfL4ilkuS89GQovxUpmLz6C1UC7VYVVRILeZS740FVB3j9V4P4FHUk1RenaDfKhcntqgVCHtjw== +web3-bzz@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" + integrity sha512-b1O2ObsqUN1lJxmFSjvnEC4TsaCbmh7Owj3IAIWTKqL9qhVgx7Qsu5O9cD13pBiSPNZJ68uJPaKq380QB4NWeA== dependencies: + "@types/node" "^10.12.18" got "9.6.0" swarm-js "0.1.39" underscore "1.9.1" -web3-bzz@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.2.tgz#a3b9f613c49fd3e120e0997088a73557d5adb724" - integrity sha512-b1O2ObsqUN1lJxmFSjvnEC4TsaCbmh7Owj3IAIWTKqL9qhVgx7Qsu5O9cD13pBiSPNZJ68uJPaKq380QB4NWeA== +web3-bzz@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-bzz/-/web3-bzz-1.2.4.tgz#a4adb7a8cba3d260de649bdb1f14ed359bfb3821" + integrity sha512-MqhAo/+0iQSMBtt3/QI1rU83uvF08sYq8r25+OUZ+4VtihnYsmkkca+rdU0QbRyrXY2/yGIpI46PFdh0khD53A== dependencies: "@types/node" "^10.12.18" got "9.6.0" @@ -21435,15 +21449,6 @@ web3-core-helpers@1.0.0-beta.36: web3-eth-iban "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-core-helpers@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.1.tgz#f5f32d71c60a4a3bd14786118e633ce7ca6d5d0d" - integrity sha512-Gx3sTEajD5r96bJgfuW377PZVFmXIH4TdqDhgGwd2lZQCcMi+DA4TgxJNJGxn0R3aUVzyyE76j4LBrh412mXrw== - dependencies: - underscore "1.9.1" - web3-eth-iban "1.2.1" - web3-utils "1.2.1" - web3-core-helpers@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.2.tgz#484974f4bd4a487217b85b0d7cfe841af0907619" @@ -21453,6 +21458,15 @@ web3-core-helpers@1.2.2: web3-eth-iban "1.2.2" web3-utils "1.2.2" +web3-core-helpers@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.2.4.tgz#ffd425861f4d66b3f38df032afdb39ea0971fc0f" + integrity sha512-U7wbsK8IbZvF3B7S+QMSNP0tni/6VipnJkB0tZVEpHEIV2WWeBHYmZDnULWcsS/x/jn9yKhJlXIxWGsEAMkjiw== + dependencies: + underscore "1.9.1" + web3-eth-iban "1.2.4" + web3-utils "1.2.4" + web3-core-method@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.0.0-beta.36.tgz#855c0365ae7d0ead394d973ea9e28828602900e0" @@ -21464,17 +21478,6 @@ web3-core-method@1.0.0-beta.36: web3-core-subscriptions "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-core-method@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.1.tgz#9df1bafa2cd8be9d9937e01c6a47fc768d15d90a" - integrity sha512-Ghg2WS23qi6Xj8Od3VCzaImLHseEA7/usvnOItluiIc5cKs00WYWsNy2YRStzU9a2+z8lwQywPYp0nTzR/QXdQ== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-core-subscriptions "1.2.1" - web3-utils "1.2.1" - web3-core-method@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.2.tgz#d4fe2bb1945b7152e5f08e4ea568b171132a1e56" @@ -21486,6 +21489,17 @@ web3-core-method@1.2.2: web3-core-subscriptions "1.2.2" web3-utils "1.2.2" +web3-core-method@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.2.4.tgz#a0fbc50b8ff5fd214021435cc2c6d1e115807aed" + integrity sha512-8p9kpL7di2qOVPWgcM08kb+yKom0rxRCMv6m/K+H+yLSxev9TgMbCgMSbPWAHlyiF3SJHw7APFKahK5Z+8XT5A== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.4" + web3-core-promievent "1.2.4" + web3-core-subscriptions "1.2.4" + web3-utils "1.2.4" + web3-core-promievent@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.0.0-beta.36.tgz#3a5127787fff751be6de272722cbc77dc9523fd5" @@ -21494,14 +21508,6 @@ web3-core-promievent@1.0.0-beta.36: any-promise "1.3.0" eventemitter3 "1.1.1" -web3-core-promievent@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.1.tgz#003e8a3eb82fb27b6164a6d5b9cad04acf733838" - integrity sha512-IVUqgpIKoeOYblwpex4Hye6npM0aMR+kU49VP06secPeN0rHMyhGF0ZGveWBrGvf8WDPI7jhqPBFIC6Jf3Q3zw== - dependencies: - any-promise "1.3.0" - eventemitter3 "3.1.2" - web3-core-promievent@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.2.tgz#3b60e3f2a0c96db8a891c927899d29d39e66ab1c" @@ -21510,6 +21516,14 @@ web3-core-promievent@1.2.2: any-promise "1.3.0" eventemitter3 "3.1.2" +web3-core-promievent@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.2.4.tgz#75e5c0f2940028722cdd21ba503ebd65272df6cb" + integrity sha512-gEUlm27DewUsfUgC3T8AxkKi8Ecx+e+ZCaunB7X4Qk3i9F4C+5PSMGguolrShZ7Zb6717k79Y86f3A00O0VAZw== + dependencies: + any-promise "1.3.0" + eventemitter3 "3.1.2" + web3-core-requestmanager@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.0.0-beta.36.tgz#70c8eead84da9ed1cf258e6dde3f137116d0691b" @@ -21521,17 +21535,6 @@ web3-core-requestmanager@1.0.0-beta.36: web3-providers-ipc "1.0.0-beta.36" web3-providers-ws "1.0.0-beta.36" -web3-core-requestmanager@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.1.tgz#fa2e2206c3d738db38db7c8fe9c107006f5c6e3d" - integrity sha512-xfknTC69RfYmLKC+83Jz73IC3/sS2ZLhGtX33D4Q5nQ8yc39ElyAolxr9sJQS8kihOcM6u4J+8gyGMqsLcpIBg== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-providers-http "1.2.1" - web3-providers-ipc "1.2.1" - web3-providers-ws "1.2.1" - web3-core-requestmanager@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.2.tgz#667ba9ac724c9c76fa8965ae8a3c61f66e68d8d6" @@ -21543,6 +21546,17 @@ web3-core-requestmanager@1.2.2: web3-providers-ipc "1.2.2" web3-providers-ws "1.2.2" +web3-core-requestmanager@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.2.4.tgz#0a7020a23fb91c6913c611dfd3d8c398d1e4b4a8" + integrity sha512-eZJDjyNTDtmSmzd3S488nR/SMJtNnn/GuwxnMh3AzYCqG3ZMfOylqTad2eYJPvc2PM5/Gj1wAMQcRpwOjjLuPg== + dependencies: + underscore "1.9.1" + web3-core-helpers "1.2.4" + web3-providers-http "1.2.4" + web3-providers-ipc "1.2.4" + web3-providers-ws "1.2.4" + web3-core-subscriptions@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.0.0-beta.36.tgz#20f1f20c85d5b40f1e5a49b070ba977a142621f3" @@ -21552,15 +21566,6 @@ web3-core-subscriptions@1.0.0-beta.36: underscore "1.8.3" web3-core-helpers "1.0.0-beta.36" -web3-core-subscriptions@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.1.tgz#8c2368a839d4eec1c01a4b5650bbeb82d0e4a099" - integrity sha512-nmOwe3NsB8V8UFsY1r+sW6KjdOS68h8nuh7NzlWxBQT/19QSUGiERRTaZXWu5BYvo1EoZRMxCKyCQpSSXLc08g== - dependencies: - eventemitter3 "3.1.2" - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-core-subscriptions@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.2.tgz#bf4ba23a653a003bdc3551649958cc0b080b068e" @@ -21570,6 +21575,15 @@ web3-core-subscriptions@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" +web3-core-subscriptions@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.2.4.tgz#0dc095b5cfd82baa527a39796e3515a846b21b99" + integrity sha512-3D607J2M8ymY9V+/WZq4MLlBulwCkwEjjC2U+cXqgVO1rCyVqbxZNCmHyNYHjDDCxSEbks9Ju5xqJxDSxnyXEw== + dependencies: + eventemitter3 "3.1.2" + underscore "1.9.1" + web3-core-helpers "1.2.4" + web3-core@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.0.0-beta.36.tgz#86182f2456c2cf1cd6e7654d314e195eac211917" @@ -21580,16 +21594,6 @@ web3-core@1.0.0-beta.36: web3-core-requestmanager "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-core@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.1.tgz#7278b58fb6495065e73a77efbbce781a7fddf1a9" - integrity sha512-5ODwIqgl8oIg/0+Ai4jsLxkKFWJYE0uLuE1yUKHNVCL4zL6n3rFjRMpKPokd6id6nJCNgeA64KdWQ4XfpnjdMg== - dependencies: - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-requestmanager "1.2.1" - web3-utils "1.2.1" - web3-core@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.2.tgz#334b99c8222ef9cfd0339e27352f0b58ea789a2f" @@ -21602,6 +21606,19 @@ web3-core@1.2.2: web3-core-requestmanager "1.2.2" web3-utils "1.2.2" +web3-core@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.2.4.tgz#2df13b978dcfc59c2abaa887d27f88f21ad9a9d6" + integrity sha512-CHc27sMuET2cs1IKrkz7xzmTdMfZpYswe7f0HcuyneTwS1yTlTnHyqjAaTy0ZygAb/x4iaVox+Gvr4oSAqSI+A== + dependencies: + "@types/bignumber.js" "^5.0.0" + "@types/bn.js" "^4.11.4" + "@types/node" "^12.6.1" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-core-requestmanager "1.2.4" + web3-utils "1.2.4" + web3-eth-abi@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.36.tgz#21c0f222701db827a8a269accb9cd18bbd8f70f9" @@ -21611,15 +21628,6 @@ web3-eth-abi@1.0.0-beta.36: underscore "1.8.3" web3-utils "1.0.0-beta.36" -web3-eth-abi@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.1.tgz#9b915b1c9ebf82f70cca631147035d5419064689" - integrity sha512-jI/KhU2a/DQPZXHjo2GW0myEljzfiKOn+h1qxK1+Y9OQfTcBMxrQJyH5AP89O6l6NZ1QvNdq99ThAxBFoy5L+g== - dependencies: - ethers "4.0.0-beta.3" - underscore "1.9.1" - web3-utils "1.2.1" - web3-eth-abi@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.2.tgz#d5616d88a90020f894763423a9769f2da11fe37a" @@ -21629,6 +21637,15 @@ web3-eth-abi@1.2.2: underscore "1.9.1" web3-utils "1.2.2" +web3-eth-abi@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.2.4.tgz#5b73e5ef70b03999227066d5d1310b168845e2b8" + integrity sha512-8eLIY4xZKoU3DSVu1pORluAw9Ru0/v4CGdw5so31nn+7fR8zgHMgwbFe0aOqWQ5VU42PzMMXeIJwt4AEi2buFg== + dependencies: + ethers "4.0.0-beta.3" + underscore "1.9.1" + web3-utils "1.2.4" + web3-eth-accounts@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.0.0-beta.36.tgz#8aea37df9b038ef2c6cda608856ffd861b39eeef" @@ -21645,23 +21662,6 @@ web3-eth-accounts@1.0.0-beta.36: web3-core-method "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-eth-accounts@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.1.tgz#2741a8ef337a7219d57959ac8bd118b9d68d63cf" - integrity sha512-26I4qq42STQ8IeKUyur3MdQ1NzrzCqPsmzqpux0j6X/XBD7EjZ+Cs0lhGNkSKH5dI3V8CJasnQ5T1mNKeWB7nQ== - dependencies: - any-promise "1.3.0" - crypto-browserify "3.12.0" - eth-lib "0.2.7" - scryptsy "2.1.0" - semver "6.2.0" - underscore "1.9.1" - uuid "3.3.2" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" - web3-eth-accounts@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.2.tgz#c187e14bff6baa698ac352220290222dbfd332e5" @@ -21680,6 +21680,24 @@ web3-eth-accounts@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" +web3-eth-accounts@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.2.4.tgz#ada6edc49542354328a85cafab067acd7f88c288" + integrity sha512-04LzT/UtWmRFmi4hHRewP5Zz43fWhuHiK5XimP86sUQodk/ByOkXQ3RoXyGXFMNoRxdcAeRNxSfA2DpIBc9xUw== + dependencies: + "@web3-js/scrypt-shim" "^0.1.0" + any-promise "1.3.0" + crypto-browserify "3.12.0" + eth-lib "0.2.7" + ethereumjs-common "^1.3.2" + ethereumjs-tx "^2.1.1" + underscore "1.9.1" + uuid "3.3.2" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-utils "1.2.4" + web3-eth-contract@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.0.0-beta.36.tgz#c0c366c4e4016896142208cee758a2ff2a31be2a" @@ -21694,20 +21712,6 @@ web3-eth-contract@1.0.0-beta.36: web3-eth-abi "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-eth-contract@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.1.tgz#3542424f3d341386fd9ff65e78060b85ac0ea8c4" - integrity sha512-kYFESbQ3boC9bl2rYVghj7O8UKMiuKaiMkxvRH5cEDHil8V7MGEGZNH0slSdoyeftZVlaWSMqkRP/chfnKND0g== - dependencies: - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-promievent "1.2.1" - web3-core-subscriptions "1.2.1" - web3-eth-abi "1.2.1" - web3-utils "1.2.1" - web3-eth-contract@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.2.tgz#84e92714918a29e1028ee7718f0712536e14e9a1" @@ -21723,6 +21727,21 @@ web3-eth-contract@1.2.2: web3-eth-abi "1.2.2" web3-utils "1.2.2" +web3-eth-contract@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.2.4.tgz#68ef7cc633232779b0a2c506a810fbe903575886" + integrity sha512-b/9zC0qjVetEYnzRA1oZ8gF1OSSUkwSYi5LGr4GeckLkzXP7osEnp9lkO/AQcE4GpG+l+STnKPnASXJGZPgBRQ== + dependencies: + "@types/bn.js" "^4.11.4" + underscore "1.9.1" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-core-promievent "1.2.4" + web3-core-subscriptions "1.2.4" + web3-eth-abi "1.2.4" + web3-utils "1.2.4" + web3-eth-ens@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.0.0-beta.36.tgz#c7440b42b597fd74f64bc402f03ad2e832f423d8" @@ -21737,20 +21756,6 @@ web3-eth-ens@1.0.0-beta.36: web3-eth-contract "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-eth-ens@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.1.tgz#a0e52eee68c42a8b9865ceb04e5fb022c2d971d5" - integrity sha512-lhP1kFhqZr2nnbu3CGIFFrAnNxk2veXpOXBY48Tub37RtobDyHijHgrj+xTh+mFiPokyrapVjpFsbGa+Xzye4Q== - dependencies: - eth-ens-namehash "2.0.8" - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-promievent "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-contract "1.2.1" - web3-utils "1.2.1" - web3-eth-ens@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.2.tgz#0a4abed1d4cbdacbf5e1ab06e502d806d1192bc6" @@ -21765,6 +21770,20 @@ web3-eth-ens@1.2.2: web3-eth-contract "1.2.2" web3-utils "1.2.2" +web3-eth-ens@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.2.4.tgz#b95b3aa99fb1e35c802b9e02a44c3046a3fa065e" + integrity sha512-g8+JxnZlhdsCzCS38Zm6R/ngXhXzvc3h7bXlxgKU4coTzLLoMpgOAEz71GxyIJinWTFbLXk/WjNY0dazi9NwVw== + dependencies: + eth-ens-namehash "2.0.8" + underscore "1.9.1" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-promievent "1.2.4" + web3-eth-abi "1.2.4" + web3-eth-contract "1.2.4" + web3-utils "1.2.4" + web3-eth-iban@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.36.tgz#00cb3aba7a5aeb15d02b07421042e263d7b2e01b" @@ -21773,14 +21792,6 @@ web3-eth-iban@1.0.0-beta.36: bn.js "4.11.6" web3-utils "1.0.0-beta.36" -web3-eth-iban@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.1.tgz#2c3801718946bea24e9296993a975c80b5acf880" - integrity sha512-9gkr4QPl1jCU+wkgmZ8EwODVO3ovVj6d6JKMos52ggdT2YCmlfvFVF6wlGLwi0VvNa/p+0BjJzaqxnnG/JewjQ== - dependencies: - bn.js "4.11.8" - web3-utils "1.2.1" - web3-eth-iban@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.2.tgz#76bec73bad214df7c4192388979a59fc98b96c5a" @@ -21789,6 +21800,14 @@ web3-eth-iban@1.2.2: bn.js "4.11.8" web3-utils "1.2.2" +web3-eth-iban@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.2.4.tgz#8e0550fd3fd8e47a39357d87fe27dee9483ee476" + integrity sha512-D9HIyctru/FLRpXakRwmwdjb5bWU2O6UE/3AXvRm6DCOf2e+7Ve11qQrPtaubHfpdW3KWjDKvlxV9iaFv/oTMQ== + dependencies: + bn.js "4.11.8" + web3-utils "1.2.4" + web3-eth-personal@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.0.0-beta.36.tgz#95545998a8ee377e3bb71e27c8d1a5dc1d7d5a21" @@ -21800,17 +21819,6 @@ web3-eth-personal@1.0.0-beta.36: web3-net "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-eth-personal@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.1.tgz#244e9911b7b482dc17c02f23a061a627c6e47faf" - integrity sha512-RNDVSiaSoY4aIp8+Hc7z+X72H7lMb3fmAChuSBADoEc7DsJrY/d0R5qQDK9g9t2BO8oxgLrLNyBP/9ub2Hc6Bg== - dependencies: - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" - web3-eth-personal@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.2.tgz#eee1c86a8132fa16b5e34c6d421ca92e684f0be6" @@ -21823,6 +21831,18 @@ web3-eth-personal@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" +web3-eth-personal@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.2.4.tgz#3224cca6851c96347d9799b12c1b67b2a6eb232b" + integrity sha512-5Russ7ZECwHaZXcN3DLuLS7390Vzgrzepl4D87SD6Sn1DHsCZtvfdPIYwoTmKNp69LG3mORl7U23Ga5YxqkICw== + dependencies: + "@types/node" "^12.6.1" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-net "1.2.4" + web3-utils "1.2.4" + web3-eth@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.0.0-beta.36.tgz#04a8c748d344c1accaa26d7d5d0eac0da7127f14" @@ -21842,25 +21862,6 @@ web3-eth@1.0.0-beta.36: web3-net "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-eth@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.1.tgz#b9989e2557c73a9e8ffdc107c6dafbe72c79c1b0" - integrity sha512-/2xly4Yry5FW1i+uygPjhfvgUP/MS/Dk+PDqmzp5M88tS86A+j8BzKc23GrlA8sgGs0645cpZK/999LpEF5UdA== - dependencies: - underscore "1.9.1" - web3-core "1.2.1" - web3-core-helpers "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-eth-abi "1.2.1" - web3-eth-accounts "1.2.1" - web3-eth-contract "1.2.1" - web3-eth-ens "1.2.1" - web3-eth-iban "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-utils "1.2.1" - web3-eth@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.2.tgz#65a1564634a23b990efd1655bf94ad513904286c" @@ -21880,6 +21881,25 @@ web3-eth@1.2.2: web3-net "1.2.2" web3-utils "1.2.2" +web3-eth@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.2.4.tgz#24c3b1f1ac79351bbfb808b2ab5c585fa57cdd00" + integrity sha512-+j+kbfmZsbc3+KJpvHM16j1xRFHe2jBAniMo1BHKc3lho6A8Sn9Buyut6odubguX2AxoRArCdIDCkT9hjUERpA== + dependencies: + underscore "1.9.1" + web3-core "1.2.4" + web3-core-helpers "1.2.4" + web3-core-method "1.2.4" + web3-core-subscriptions "1.2.4" + web3-eth-abi "1.2.4" + web3-eth-accounts "1.2.4" + web3-eth-contract "1.2.4" + web3-eth-ens "1.2.4" + web3-eth-iban "1.2.4" + web3-eth-personal "1.2.4" + web3-net "1.2.4" + web3-utils "1.2.4" + web3-net@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.0.0-beta.36.tgz#396cd35cb40934ed022a1f44a8a642d3908c41eb" @@ -21889,15 +21909,6 @@ web3-net@1.0.0-beta.36: web3-core-method "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3-net@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.1.tgz#edd249503315dd5ab4fa00220f6509d95bb7ab10" - integrity sha512-Yt1Bs7WgnLESPe0rri/ZoPWzSy55ovioaP35w1KZydrNtQ5Yq4WcrAdhBzcOW7vAkIwrsLQsvA+hrOCy7mNauw== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-utils "1.2.1" - web3-net@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.2.tgz#5c3226ca72df7c591422440ce6f1203fd42ddad9" @@ -21907,6 +21918,15 @@ web3-net@1.2.2: web3-core-method "1.2.2" web3-utils "1.2.2" +web3-net@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.2.4.tgz#1d246406d3aaffbf39c030e4e98bce0ca5f25458" + integrity sha512-wKOsqhyXWPSYTGbp7ofVvni17yfRptpqoUdp3SC8RAhDmGkX6irsiT9pON79m6b3HUHfLoBilFQyt/fTUZOf7A== + dependencies: + web3-core "1.2.4" + web3-core-method "1.2.4" + web3-utils "1.2.4" + web3-providers-http@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.0.0-beta.36.tgz#c1937a2e64f8db7cd30f166794e37cf0fcca1131" @@ -21915,14 +21935,6 @@ web3-providers-http@1.0.0-beta.36: web3-core-helpers "1.0.0-beta.36" xhr2-cookies "1.1.0" -web3-providers-http@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.1.tgz#c93ea003a42e7b894556f7e19dd3540f947f5013" - integrity sha512-BDtVUVolT9b3CAzeGVA/np1hhn7RPUZ6YYGB/sYky+GjeO311Yoq8SRDUSezU92x8yImSC2B+SMReGhd1zL+bQ== - dependencies: - web3-core-helpers "1.2.1" - xhr2-cookies "1.1.0" - web3-providers-http@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.2.tgz#155e55c1d69f4c5cc0b411ede40dea3d06720956" @@ -21931,6 +21943,14 @@ web3-providers-http@1.2.2: web3-core-helpers "1.2.2" xhr2-cookies "1.1.0" +web3-providers-http@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.2.4.tgz#514fcad71ae77832c2c15574296282fbbc5f4a67" + integrity sha512-dzVCkRrR/cqlIrcrWNiPt9gyt0AZTE0J+MfAu9rR6CyIgtnm1wFUVVGaxYRxuTGQRO4Dlo49gtoGwaGcyxqiTw== + dependencies: + web3-core-helpers "1.2.4" + xhr2-cookies "1.1.0" + web3-providers-ipc@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.0.0-beta.36.tgz#0c78efb4ed6b0305ec830e1e0b785e61217ee605" @@ -21940,15 +21960,6 @@ web3-providers-ipc@1.0.0-beta.36: underscore "1.8.3" web3-core-helpers "1.0.0-beta.36" -web3-providers-ipc@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.1.tgz#017bfc687a8fc5398df2241eb98f135e3edd672c" - integrity sha512-oPEuOCwxVx8L4CPD0TUdnlOUZwGBSRKScCz/Ws2YHdr9Ium+whm+0NLmOZjkjQp5wovQbyBzNa6zJz1noFRvFA== - dependencies: - oboe "2.1.4" - underscore "1.9.1" - web3-core-helpers "1.2.1" - web3-providers-ipc@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.2.tgz#c6d165a12bc68674b4cdd543ea18aec79cafc2e8" @@ -21958,6 +21969,15 @@ web3-providers-ipc@1.2.2: underscore "1.9.1" web3-core-helpers "1.2.2" +web3-providers-ipc@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.2.4.tgz#9d6659f8d44943fb369b739f48df09092be459bd" + integrity sha512-8J3Dguffin51gckTaNrO3oMBo7g+j0UNk6hXmdmQMMNEtrYqw4ctT6t06YOf9GgtOMjSAc1YEh3LPrvgIsR7og== + dependencies: + oboe "2.1.4" + underscore "1.9.1" + web3-core-helpers "1.2.4" + web3-providers-ws@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.0.0-beta.36.tgz#27b74082c7adfa0cb5a65535eb312e49008c97c3" @@ -21967,15 +21987,6 @@ web3-providers-ws@1.0.0-beta.36: web3-core-helpers "1.0.0-beta.36" websocket "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible" -web3-providers-ws@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.1.tgz#2d941eaf3d5a8caa3214eff8dc16d96252b842cb" - integrity sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA== - dependencies: - underscore "1.9.1" - web3-core-helpers "1.2.1" - websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" - web3-providers-ws@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.2.tgz#d2c05c68598cea5ad3fa6ef076c3bcb3ca300d29" @@ -21985,6 +21996,15 @@ web3-providers-ws@1.2.2: web3-core-helpers "1.2.2" websocket "github:web3-js/WebSocket-Node#polyfill/globalThis" +web3-providers-ws@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.2.4.tgz#099ee271ee03f6ea4f5df9cfe969e83f4ce0e36f" + integrity sha512-F/vQpDzeK+++oeeNROl1IVTufFCwCR2hpWe5yRXN0ApLwHqXrMI7UwQNdJ9iyibcWjJf/ECbauEEQ8CHgE+MYQ== + dependencies: + "@web3-js/websocket" "^1.0.29" + underscore "1.9.1" + web3-core-helpers "1.2.4" + web3-shh@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.0.0-beta.36.tgz#6ff297594480edefc710d9d287765a0c4a5d5af1" @@ -21995,16 +22015,6 @@ web3-shh@1.0.0-beta.36: web3-core-subscriptions "1.0.0-beta.36" web3-net "1.0.0-beta.36" -web3-shh@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.1.tgz#4460e3c1e07faf73ddec24ccd00da46f89152b0c" - integrity sha512-/3Cl04nza5kuFn25bV3FJWa0s3Vafr5BlT933h26xovQ6HIIz61LmvNQlvX1AhFL+SNJOTcQmK1SM59vcyC8bA== - dependencies: - web3-core "1.2.1" - web3-core-method "1.2.1" - web3-core-subscriptions "1.2.1" - web3-net "1.2.1" - web3-shh@1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.2.tgz#44ed998f2a6ba0ec5cb9d455184a0f647826a49c" @@ -22015,6 +22025,16 @@ web3-shh@1.2.2: web3-core-subscriptions "1.2.2" web3-net "1.2.2" +web3-shh@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-shh/-/web3-shh-1.2.4.tgz#5c8ff5ab624a3b14f08af0d24d2b16c10e9f70dd" + integrity sha512-z+9SCw0dE+69Z/Hv8809XDbLj7lTfEv9Sgu8eKEIdGntZf4v7ewj5rzN5bZZSz8aCvfK7Y6ovz1PBAu4QzS4IQ== + dependencies: + web3-core "1.2.4" + web3-core-method "1.2.4" + web3-core-subscriptions "1.2.4" + web3-net "1.2.4" + web3-utils@1.0.0-beta.36: version "1.0.0-beta.36" resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.0.0-beta.36.tgz#dc19c9aeec009b1816cc91ef64d7fe9f8ee344c9" @@ -22028,23 +22048,24 @@ web3-utils@1.0.0-beta.36: underscore "1.8.3" utf8 "2.1.1" -web3-utils@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.1.tgz#21466e38291551de0ab34558de21512ac4274534" - integrity sha512-Mrcn3l58L+yCKz3zBryM6JZpNruWuT0OCbag8w+reeNROSGVlXzUQkU+gtAwc9JCZ7tKUyg67+2YUGqUjVcyBA== +web3-utils@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.2.tgz#b53a08c40d2c3f31d3c4a28e7d749405df99c8c0" + integrity sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A== dependencies: bn.js "4.11.8" eth-lib "0.2.7" + ethereum-bloom-filters "^1.0.6" ethjs-unit "0.1.6" number-to-bn "1.7.0" - randomhex "0.1.5" + randombytes "^2.1.0" underscore "1.9.1" utf8 "3.0.0" -web3-utils@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.2.tgz#b53a08c40d2c3f31d3c4a28e7d749405df99c8c0" - integrity sha512-joF+s3243TY5cL7Z7y4h1JsJpUCf/kmFmj+eJar7Y2yNIGVcW961VyrAms75tjUysSuHaUQ3eQXjBEUJueT52A== +web3-utils@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.4.tgz#96832a39a66b05bf8862a5b0bdad2799d709d951" + integrity sha512-+S86Ip+jqfIPQWvw2N/xBQq5JNqCO0dyvukGdJm8fEWHZbckT4WxSpHbx+9KLEWY4H4x9pUwnoRkK87pYyHfgQ== dependencies: bn.js "4.11.8" eth-lib "0.2.7" @@ -22079,18 +22100,19 @@ web3@1.0.0-beta.36: web3-shh "1.0.0-beta.36" web3-utils "1.0.0-beta.36" -web3@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.1.tgz#5d8158bcca47838ab8c2b784a2dee4c3ceb4179b" - integrity sha512-nNMzeCK0agb5i/oTWNdQ1aGtwYfXzHottFP2Dz0oGIzavPMGSKyVlr8ibVb1yK5sJBjrWVnTdGaOC2zKDFuFRw== +web3@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.4.tgz#6e7ab799eefc9b4648c2dab63003f704a1d5e7d9" + integrity sha512-xPXGe+w0x0t88Wj+s/dmAdASr3O9wmA9mpZRtixGZxmBexAF0MjfqYM+MS4tVl5s11hMTN3AZb8cDD4VLfC57A== dependencies: - web3-bzz "1.2.1" - web3-core "1.2.1" - web3-eth "1.2.1" - web3-eth-personal "1.2.1" - web3-net "1.2.1" - web3-shh "1.2.1" - web3-utils "1.2.1" + "@types/node" "^12.6.1" + web3-bzz "1.2.4" + web3-core "1.2.4" + web3-eth "1.2.4" + web3-eth-personal "1.2.4" + web3-net "1.2.4" + web3-shh "1.2.4" + web3-utils "1.2.4" web3@^0.20.6: version "0.20.7" @@ -22816,7 +22838,7 @@ yaml@^1.7.2: dependencies: "@babel/runtime" "^7.6.3" -yargs-parser@13.1.1, yargs-parser@^13.1.1: +yargs-parser@13.1.1, yargs-parser@^13.1.0, yargs-parser@^13.1.1: version "13.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== @@ -22914,6 +22936,23 @@ yargs@12.0.2: y18n "^3.2.1 || ^4.0.0" yargs-parser "^10.1.0" +yargs@13.2.4: + version "13.2.4" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" + integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== + dependencies: + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" + os-locale "^3.1.0" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^3.0.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^13.1.0" + yargs@13.3.0, yargs@^13.2.0, yargs@^13.3.0: version "13.3.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"