From 7ae38906926dc09bc10670c361af0d2bf0050426 Mon Sep 17 00:00:00 2001 From: Hsuan Lee Date: Sat, 19 Jan 2019 18:42:04 +0800 Subject: Update dependency packages --- packages/web3-wrapper/.npmignore | 6 - packages/web3-wrapper/CHANGELOG.json | 489 ---------------- packages/web3-wrapper/CHANGELOG.md | 190 ------- packages/web3-wrapper/README.md | 71 --- packages/web3-wrapper/coverage/.gitkeep | 0 packages/web3-wrapper/package.json | 69 --- packages/web3-wrapper/src/globals.d.ts | 6 - packages/web3-wrapper/src/index.ts | 60 -- packages/web3-wrapper/src/marshaller.ts | 230 -------- packages/web3-wrapper/src/types.ts | 92 ---- packages/web3-wrapper/src/utils.ts | 54 -- packages/web3-wrapper/src/web3_wrapper.ts | 703 ------------------------ packages/web3-wrapper/test/utils/chai_setup.ts | 13 - packages/web3-wrapper/test/web3_wrapper_test.ts | 169 ------ packages/web3-wrapper/tsconfig.json | 8 - packages/web3-wrapper/tslint.json | 3 - packages/web3-wrapper/typedoc-tsconfig.json | 7 - 17 files changed, 2170 deletions(-) delete mode 100644 packages/web3-wrapper/.npmignore delete mode 100644 packages/web3-wrapper/CHANGELOG.json delete mode 100644 packages/web3-wrapper/CHANGELOG.md delete mode 100644 packages/web3-wrapper/README.md delete mode 100644 packages/web3-wrapper/coverage/.gitkeep delete mode 100644 packages/web3-wrapper/package.json delete mode 100644 packages/web3-wrapper/src/globals.d.ts delete mode 100644 packages/web3-wrapper/src/index.ts delete mode 100644 packages/web3-wrapper/src/marshaller.ts delete mode 100644 packages/web3-wrapper/src/types.ts delete mode 100644 packages/web3-wrapper/src/utils.ts delete mode 100644 packages/web3-wrapper/src/web3_wrapper.ts delete mode 100644 packages/web3-wrapper/test/utils/chai_setup.ts delete mode 100644 packages/web3-wrapper/test/web3_wrapper_test.ts delete mode 100644 packages/web3-wrapper/tsconfig.json delete mode 100644 packages/web3-wrapper/tslint.json delete mode 100644 packages/web3-wrapper/typedoc-tsconfig.json (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/.npmignore b/packages/web3-wrapper/.npmignore deleted file mode 100644 index 24e65ad5b..000000000 --- a/packages/web3-wrapper/.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -.* -yarn-error.log -/scripts/ -/src/ -tsconfig.json -/lib/monorepo_scripts/ diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json deleted file mode 100644 index 4a639f662..000000000 --- a/packages/web3-wrapper/CHANGELOG.json +++ /dev/null @@ -1,489 +0,0 @@ -[ - { - "version": "4.0.0", - "changes": [ - { - "note": "Upgrade the bignumber.js to v8.0.2", - "pr": 1517 - }, - { - "note": "Update ganache-core to v2.3.3", - "pr": 1518 - } - ] - }, - { - "timestamp": 1547561734, - "version": "3.2.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1547225310, - "version": "3.2.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1547040760, - "version": "3.2.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "3.2.1", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1544739608 - }, - { - "version": "3.2.0", - "changes": [ - { - "note": "Return `value` and `gasPrice` as BigNumbers to avoid loss of precision errors", - "pr": 1402 - } - ], - "timestamp": 1544570656 - }, - { - "version": "3.1.6", - "changes": [ - { - "note": "Unmarshall mined transaction receipts", - "pr": 1308 - } - ], - "timestamp": 1543401373 - }, - { - "version": "3.1.5", - "changes": [ - { - "note": "Add unmarshalling of transaction receipts", - "pr": 1291 - }, - { - "note": "Return `undefined` instead of `null` if transaction receipt not found", - "pr": 1291 - } - ], - "timestamp": 1542821676 - }, - { - "timestamp": 1542208198, - "version": "3.1.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542134075, - "version": "3.1.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1542028948, - "version": "3.1.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "3.1.1", - "changes": [ - { - "note": "Fix bug in `getTransactionByHashAsync` which was causing the return value to have the wrong type (raw fields instead of unmarshalled fields).", - "pr": 1177 - } - ], - "timestamp": 1541740904 - }, - { - "version": "3.1.0", - "changes": [ - { - "note": "Add `signTypedData` to perform EIP712 `eth_signTypedData`.", - "pr": 1102 - }, - { - "note": "Web3Wrapper now throws when an RPC request contains an error field in the response. Previously errors could be swallowed and undefined returned.", - "pr": 1102 - } - ], - "timestamp": 1539871071 - }, - { - "version": "3.0.3", - "changes": [ - { - "note": "Dependencies updated" - } - ], - "timestamp": 1538693146 - }, - { - "timestamp": 1538157789, - "version": "3.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1537907159, - "version": "3.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "3.0.0", - "changes": [ - { - "note": "Rename `getBlockAsync` to `getBlockIfExistsAsync` and rather then throw if the requested block wasn't found, return undefined.", - "pr": 1082 - }, - { - "note": "Expose `sendRawPayloadAsync` so one can easily extend `Web3Wrapper` with their own custom JSON RPC calls", - "pr": 1080 - } - ], - "timestamp": 1537875740 - }, - { - "version": "2.0.3", - "changes": [ - { - "note": "Fixes issue #1076 where Parity now returns a placeholder transactionReceipt before the transaction is mined.", - "pr": 1079 - } - ], - "timestamp": 1537541580 - }, - { - "timestamp": 1536142250, - "version": "2.0.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1535377027, - "version": "2.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "2.0.0", - "changes": [ - { - "note": "Export types: `BlockParam`, `TxData`, `Provider`, `TransactionReceipt`, `Transaction`, `TraceParams`, `TransactionTrace``, BlockWithoutTransactionDat`a, `LogEntry`, `FilterObject`, `CallData`, `TransactionReceiptWithDecodedLogs`, `BlockWithTransactionData``, LogTopi`c, `JSONRPCRequestPayload`, `TransactionReceiptStatus`, `DecodedLogArgs`, `StructLog`, `JSONRPCErrorCallback``, BlockParamLitera`l, `ContractEventArg`, `DecodedLogEntry`, `LogEntryEvent`, `OpCode`, `TxDataPayable`, `JSONRPCResponsePayload``, RawLogEntr`y, `DecodedLogEntryEvent`, `LogWithDecodedArgs`, `AbiDefinition`, `RawLog`, `FunctionAbi`, `EventAbi`, `EventParameter``, MethodAb`i, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability` and `StateMutability`", - "pr": 924 - }, - { - "note": "Stop exporting types: `CallTxDataBaseRPC` and `AbstractBlockRPC`", - "pr": 924 - }, - { - "note": "Export `AbiDecoder` class", - "pr": 924 - } - ], - "timestamp": 1535133899 - }, - { - "version": "1.2.0", - "changes": [ - { - "note": "Export marshaller to convert between RPC and user-space data formats", - "pr": 938 - }, - { - "note": "Export RPC types", - "pr": 938 - } - ], - "timestamp": 1534210131 - }, - { - "timestamp": 1532619515, - "version": "1.1.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532614997, - "version": "1.1.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "1.1.0", - "changes": [ - { - "note": "Add `getTransactionByHashAsync` method", - "pr": 847 - } - ], - "timestamp": 1532605697 - }, - { - "timestamp": 1532357734, - "version": "1.0.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1532043000, - "version": "1.0.0", - "changes": [ - { - "note": "Stop exporting `marshaller` utility file.", - "pr": 902 - }, - { - "note": "Export `marshaller` utility file.", - "pr": 829 - }, - { - "note": "Add `getNodeTypeAsync` method", - "pr": 812 - }, - { - "note": "Stop exporting uniqueVersionIds object", - "pr": 897 - } - ] - }, - { - "timestamp": 1531919263, - "version": "0.7.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1531149657, - "version": "0.7.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1529397769, - "version": "0.7.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1528070400, - "version": "0.7.0", - "changes": [ - { - "note": "Add `web3Wrapper.getContractCodeAsync`", - "pr": 675 - }, - { - "note": "Add `web3Wrapper.getTransactionTraceAsync`", - "pr": 675 - }, - { - "note": "Add `web3Wrapper.getBlockWithTransactionDataAsync`", - "pr": 675 - }, - { - "note": "Add exported uniqueVersionIds object", - "pr": 622 - }, - { - "note": "Update increaseTimeAsync to work with Geth", - "pr": 622 - }, - { - "note": "Make callAsync throw if raw call result is 0x (null)", - "pr": 622 - }, - { - "note": "Add new setHeadAsync method", - "pr": 622 - }, - { - "note": "Improve performance of awaitTransactionMinedAsync by immediately checking if the transaction was already mined instead of waiting for the first interval.", - "pr": 688 - } - ] - }, - { - "timestamp": 1527009133, - "version": "0.6.4", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525477860, - "version": "0.6.3", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1525428773, - "version": "0.6.2", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "timestamp": 1524044013, - "version": "0.6.1", - "changes": [ - { - "note": "Dependencies updated" - } - ] - }, - { - "version": "0.6.0", - "changes": [ - { - "note": "Make `isAddress` and `toWei` static", - "pr": 501 - }, - { - "note": "Add static methods `toUnitAmount` and `toBaseUnitAmount`", - "pr": 501 - } - ], - "timestamp": 1523462196 - }, - { - "version": "0.5.0", - "changes": [ - { - "note": "Add `web3Wrapper.awaitTransactionMinedAsync`", - "pr": 485 - }, - { - "note": "Add a public field `abiDecoder: AbiDecoder` which allows you to add your ABIs that are later used to decode logs", - "pr": 485 - }, - { - "note": "Export enum `Web3WrapperErrors` with a single value so far: `TransactionMiningTimeout`", - "pr": 485 - } - ], - "timestamp": 1522673609 - }, - { - "version": "0.4.0", - "changes": [ - { - "note": "Rename `signTransactionAsync` to `signMessageAsync` for clarity", - "pr": 465 - } - ], - "timestamp": 1522658513 - }, - { - "version": "0.3.0", - "changes": [ - { - "note": "Add `web3Wrapper.takeSnapshotAsync`, `web3Wrapper.revertSnapshotAsync`, `web3Wrapper.mineBlockAsync`, `web3Wrapper.increaseTimeAsync`", - "pr": 426 - }, - { - "note": "Add `web3Wrapper.isZeroExWeb3Wrapper` for runtime instanceOf checks", - "pr": 426 - }, - { - "note": "Add a `getProvider` method", - "pr": 444 - } - ], - "timestamp": 1521298800 - }, - { - "version": "0.2.0", - "changes": [ - { - "note": "Ensure all returned user addresses are lowercase", - "pr": 373 - }, - { - "note": "Add `web3Wrapper.callAsync`", - "pr": 413 - }, - { - "note": "Make `web3Wrapper.estimateGas` accept whole `txData` instead of `data`", - "pr": 413 - }, - { - "note": "Remove `web3Wrapper.getContractInstance`", - "pr": 413 - } - ], - "timestamp": 1520089200 - }, - { - "version": "0.1.12", - "changes": [ - { - "note": "Fix publishing issue where .npmignore was not properly excluding undesired content", - "pr": 389 - } - ], - "timestamp": 1518102000 - } -] diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md deleted file mode 100644 index 5850c5474..000000000 --- a/packages/web3-wrapper/CHANGELOG.md +++ /dev/null @@ -1,190 +0,0 @@ - - -CHANGELOG - -## v3.2.4 - _January 15, 2019_ - - * Dependencies updated - -## v3.2.3 - _January 11, 2019_ - - * Dependencies updated - -## v3.2.2 - _January 9, 2019_ - - * Dependencies updated - -## v3.2.1 - _December 13, 2018_ - - * Dependencies updated - -## v3.2.0 - _December 11, 2018_ - - * Return `value` and `gasPrice` as BigNumbers to avoid loss of precision errors (#1402) - -## v3.1.6 - _November 28, 2018_ - - * Unmarshall mined transaction receipts (#1308) - -## v3.1.5 - _November 21, 2018_ - - * Add unmarshalling of transaction receipts (#1291) - * Return `undefined` instead of `null` if transaction receipt not found (#1291) - -## v3.1.4 - _November 14, 2018_ - - * Dependencies updated - -## v3.1.3 - _November 13, 2018_ - - * Dependencies updated - -## v3.1.2 - _November 12, 2018_ - - * Dependencies updated - -## v3.1.1 - _November 9, 2018_ - - * Fix bug in `getTransactionByHashAsync` which was causing the return value to have the wrong type (raw fields instead of unmarshalled fields). (#1177) - -## v3.1.0 - _October 18, 2018_ - - * Add `signTypedData` to perform EIP712 `eth_signTypedData`. (#1102) - * Web3Wrapper now throws when an RPC request contains an error field in the response. Previously errors could be swallowed and undefined returned. (#1102) - -## v3.0.3 - _October 4, 2018_ - - * Dependencies updated - -## v3.0.2 - _September 28, 2018_ - - * Dependencies updated - -## v3.0.1 - _September 25, 2018_ - - * Dependencies updated - -## v3.0.0 - _September 25, 2018_ - - * Rename `getBlockAsync` to `getBlockIfExistsAsync` and rather then throw if the requested block wasn't found, return undefined. (#1082) - * Expose `sendRawPayloadAsync` so one can easily extend `Web3Wrapper` with their own custom JSON RPC calls (#1080) - -## v2.0.3 - _September 21, 2018_ - - * Fixes issue #1076 where Parity now returns a placeholder transactionReceipt before the transaction is mined. (#1079) - -## v2.0.2 - _September 5, 2018_ - - * Dependencies updated - -## v2.0.1 - _August 27, 2018_ - - * Dependencies updated - -## v2.0.0 - _August 24, 2018_ - - * Export types: `BlockParam`, `TxData`, `Provider`, `TransactionReceipt`, `Transaction`, `TraceParams`, `TransactionTrace``, BlockWithoutTransactionDat`a, `LogEntry`, `FilterObject`, `CallData`, `TransactionReceiptWithDecodedLogs`, `BlockWithTransactionData``, LogTopi`c, `JSONRPCRequestPayload`, `TransactionReceiptStatus`, `DecodedLogArgs`, `StructLog`, `JSONRPCErrorCallback``, BlockParamLitera`l, `ContractEventArg`, `DecodedLogEntry`, `LogEntryEvent`, `OpCode`, `TxDataPayable`, `JSONRPCResponsePayload``, RawLogEntr`y, `DecodedLogEntryEvent`, `LogWithDecodedArgs`, `AbiDefinition`, `RawLog`, `FunctionAbi`, `EventAbi`, `EventParameter``, MethodAb`i, `ConstructorAbi`, `FallbackAbi`, `DataItem`, `ConstructorStateMutability` and `StateMutability` (#924) - * Stop exporting types: `CallTxDataBaseRPC` and `AbstractBlockRPC` (#924) - * Export `AbiDecoder` class (#924) - -## v1.2.0 - _August 14, 2018_ - - * Export marshaller to convert between RPC and user-space data formats (#938) - * Export RPC types (#938) - -## v1.1.2 - _July 26, 2018_ - - * Dependencies updated - -## v1.1.1 - _July 26, 2018_ - - * Dependencies updated - -## v1.1.0 - _July 26, 2018_ - - * Add `getTransactionByHashAsync` method (#847) - -## v1.0.1 - _July 23, 2018_ - - * Dependencies updated - -## v1.0.0 - _July 19, 2018_ - - * Stop exporting `marshaller` utility file. (#902) - * Export `marshaller` utility file. (#829) - * Add `getNodeTypeAsync` method (#812) - * Stop exporting uniqueVersionIds object (#897) - -## v0.7.3 - _July 18, 2018_ - - * Dependencies updated - -## v0.7.2 - _July 9, 2018_ - - * Dependencies updated - -## v0.7.1 - _June 19, 2018_ - - * Dependencies updated - -## v0.7.0 - _June 4, 2018_ - - * Add `web3Wrapper.getContractCodeAsync` (#675) - * Add `web3Wrapper.getTransactionTraceAsync` (#675) - * Add `web3Wrapper.getBlockWithTransactionDataAsync` (#675) - * Add exported uniqueVersionIds object (#622) - * Update increaseTimeAsync to work with Geth (#622) - * Make callAsync throw if raw call result is 0x (null) (#622) - * Add new setHeadAsync method (#622) - * Improve performance of awaitTransactionMinedAsync by immediately checking if the transaction was already mined instead of waiting for the first interval. (#688) - -## v0.6.4 - _May 22, 2018_ - - * Dependencies updated - -## v0.6.3 - _May 4, 2018_ - - * Dependencies updated - -## v0.6.2 - _May 4, 2018_ - - * Dependencies updated - -## v0.6.1 - _April 18, 2018_ - - * Dependencies updated - -## v0.6.0 - _April 11, 2018_ - - * Make `isAddress` and `toWei` static (#501) - * Add static methods `toUnitAmount` and `toBaseUnitAmount` (#501) - -## v0.5.0 - _April 2, 2018_ - - * Add `web3Wrapper.awaitTransactionMinedAsync` (#485) - * Add a public field `abiDecoder: AbiDecoder` which allows you to add your ABIs that are later used to decode logs (#485) - * Export enum `Web3WrapperErrors` with a single value so far: `TransactionMiningTimeout` (#485) - -## v0.4.0 - _April 2, 2018_ - - * Rename `signTransactionAsync` to `signMessageAsync` for clarity (#465) - -## v0.3.0 - _March 17, 2018_ - - * Add `web3Wrapper.takeSnapshotAsync`, `web3Wrapper.revertSnapshotAsync`, `web3Wrapper.mineBlockAsync`, `web3Wrapper.increaseTimeAsync` (#426) - * Add `web3Wrapper.isZeroExWeb3Wrapper` for runtime instanceOf checks (#426) - * Add a `getProvider` method (#444) - -## v0.2.0 - _March 3, 2018_ - - * Ensure all returned user addresses are lowercase (#373) - * Add `web3Wrapper.callAsync` (#413) - * Make `web3Wrapper.estimateGas` accept whole `txData` instead of `data` (#413) - * Remove `web3Wrapper.getContractInstance` (#413) - -## v0.1.12 - _February 8, 2018_ - - * Fix publishing issue where .npmignore was not properly excluding undesired content (#389) diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md deleted file mode 100644 index 4402de19c..000000000 --- a/packages/web3-wrapper/README.md +++ /dev/null @@ -1,71 +0,0 @@ -## @0x/web3-wrapper - -Web3-wrapper is a JSON-RPC client for Ethereum nodes. It is a type-safe alternative to [Web3.js](https://github.com/ethereum/web3.js/) written in TypeScript. - -### Read the [Documentation](https://0xproject.com/docs/web3-wrapper). - -## Installation - -```bash -yarn add @0x/web3-wrapper -``` - -If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: - -```json -"compilerOptions": { - "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], -} -``` - -## Contributing - -We welcome improvements and fixes from the wider community! To report bugs within this package, please create an issue in this repository. - -Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. - -### Install dependencies - -If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: - -```bash -yarn config set workspaces-experimental true -``` - -Then install dependencies - -```bash -yarn install -``` - -### Build - -To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: - -```bash -PKG=@0x/web3-wrapper yarn build -``` - -Or continuously rebuild on change: - -```bash -PKG=@0x/web3-wrapper yarn watch -``` - -### Clean - -```bash -yarn clean -``` - -### Lint - -```bash -yarn lint -``` - -### Run Tests - -```bash -yarn test -``` diff --git a/packages/web3-wrapper/coverage/.gitkeep b/packages/web3-wrapper/coverage/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json deleted file mode 100644 index f28cc36ca..000000000 --- a/packages/web3-wrapper/package.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "name": "@0x/web3-wrapper", - "version": "3.2.4", - "engines": { - "node": ">=6.12" - }, - "description": "Wraps around web3 and gives a nicer interface", - "main": "lib/src/index.js", - "types": "lib/src/index.d.ts", - "scripts": { - "build": "tsc -b", - "build:ci": "yarn build", - "watch_without_deps": "tsc -w", - "clean": "shx rm -rf lib generated_docs", - "lint": "tslint --format stylish --project .", - "test": "yarn run_mocha", - "rebuild_and_test": "run-s clean build test", - "test:circleci": "yarn test:coverage", - "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit", - "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov", - "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info", - "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES" - }, - "config": { - "postpublish": { - "assets": [] - } - }, - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "https://github.com/0xProject/0x-monorepo.git" - }, - "bugs": { - "url": "https://github.com/0xProject/0x-monorepo/issues" - }, - "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", - "devDependencies": { - "@0x/tslint-config": "^2.0.2", - "@types/ganache-core": "^2.1.2", - "@types/lodash": "4.14.104", - "chai": "^4.0.1", - "chai-as-promised": "^7.1.0", - "chai-bignumber": "^3.0.0", - "dirty-chai": "^2.0.1", - "ganache-core": "^2.3.3", - "make-promises-safe": "^1.1.0", - "mocha": "^4.1.0", - "npm-run-all": "^4.1.2", - "nyc": "^11.0.1", - "shx": "^0.2.2", - "tslint": "5.11.0", - "typedoc": "0.13.0", - "typescript": "3.0.1" - }, - "dependencies": { - "@0x/assert": "^1.0.23", - "@0x/json-schemas": "^2.1.7", - "@0x/typescript-typings": "^3.0.8", - "@0x/utils": "^3.0.1", - "ethereum-types": "^1.1.6", - "ethereumjs-util": "^5.1.1", - "ethers": "~4.0.4", - "lodash": "^4.17.5" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/web3-wrapper/src/globals.d.ts b/packages/web3-wrapper/src/globals.d.ts deleted file mode 100644 index 94e63a32d..000000000 --- a/packages/web3-wrapper/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts deleted file mode 100644 index 4d20ba9be..000000000 --- a/packages/web3-wrapper/src/index.ts +++ /dev/null @@ -1,60 +0,0 @@ -export { Web3Wrapper } from './web3_wrapper'; -export { marshaller } from './marshaller'; - -export { AbiDecoder } from '@0x/utils'; - -export { - BlockParam, - TxData, - Provider, - TransactionReceipt, - Transaction, - TraceParams, - TransactionTrace, - BlockWithoutTransactionData, - LogEntry, - FilterObject, - CallData, - TransactionReceiptWithDecodedLogs, - BlockWithTransactionData, - LogTopic, - JSONRPCRequestPayload, - TransactionReceiptStatus, - DecodedLogArgs, - StructLog, - JSONRPCErrorCallback, - BlockParamLiteral, - ContractEventArg, - DecodedLogEntry, - LogEntryEvent, - OpCode, - TxDataPayable, - JSONRPCResponsePayload, - JSONRPCResponseError, - RawLogEntry, - DecodedLogEntryEvent, - LogWithDecodedArgs, - AbiDefinition, - RawLog, - FunctionAbi, - EventAbi, - EventParameter, - MethodAbi, - ConstructorAbi, - FallbackAbi, - DataItem, - ConstructorStateMutability, - StateMutability, -} from 'ethereum-types'; -export { - Web3WrapperErrors, - NodeType, - CallDataRPC, - BlockWithoutTransactionDataRPC, - BlockWithTransactionDataRPC, - TransactionReceiptStatusRPC, - TransactionReceiptRPC, - LogEntryRPC, - TransactionRPC, - TxDataRPC, -} from './types'; diff --git a/packages/web3-wrapper/src/marshaller.ts b/packages/web3-wrapper/src/marshaller.ts deleted file mode 100644 index 4230f8eab..000000000 --- a/packages/web3-wrapper/src/marshaller.ts +++ /dev/null @@ -1,230 +0,0 @@ -import { addressUtils } from '@0x/utils'; -import { - BlockParam, - BlockParamLiteral, - BlockWithoutTransactionData, - BlockWithTransactionData, - CallData, - CallTxDataBase, - LogEntry, - RawLogEntry, - Transaction, - TransactionReceipt, - TxData, -} from 'ethereum-types'; -import ethUtil = require('ethereumjs-util'); -import * as _ from 'lodash'; - -import { utils } from './utils'; - -import { - BlockWithoutTransactionDataRPC, - BlockWithTransactionDataRPC, - CallDataRPC, - CallTxDataBaseRPC, - TransactionReceiptRPC, - TransactionRPC, - TxDataRPC, -} from './types'; - -/** - * Utils to convert ethereum structures from user-space format to RPC format. (marshall/unmarshall) - */ -export const marshaller = { - /** - * Unmarshall block without transaction data - * @param blockWithHexValues block to unmarshall - * @return unmarshalled block without transaction data - */ - unmarshalIntoBlockWithoutTransactionData( - blockWithHexValues: BlockWithoutTransactionDataRPC, - ): BlockWithoutTransactionData { - const block = { - ...blockWithHexValues, - gasLimit: utils.convertHexToNumber(blockWithHexValues.gasLimit), - gasUsed: utils.convertHexToNumber(blockWithHexValues.gasUsed), - size: utils.convertHexToNumber(blockWithHexValues.size), - timestamp: utils.convertHexToNumber(blockWithHexValues.timestamp), - number: _.isNull(blockWithHexValues.number) ? null : utils.convertHexToNumber(blockWithHexValues.number), - difficulty: utils.convertAmountToBigNumber(blockWithHexValues.difficulty), - totalDifficulty: utils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty), - }; - return block; - }, - /** - * Unmarshall block with transaction data - * @param blockWithHexValues block to unmarshall - * @return unmarshalled block with transaction data - */ - unmarshalIntoBlockWithTransactionData(blockWithHexValues: BlockWithTransactionDataRPC): BlockWithTransactionData { - const block = { - ...blockWithHexValues, - gasLimit: utils.convertHexToNumber(blockWithHexValues.gasLimit), - gasUsed: utils.convertHexToNumber(blockWithHexValues.gasUsed), - size: utils.convertHexToNumber(blockWithHexValues.size), - timestamp: utils.convertHexToNumber(blockWithHexValues.timestamp), - number: _.isNull(blockWithHexValues.number) ? null : utils.convertHexToNumber(blockWithHexValues.number), - difficulty: utils.convertAmountToBigNumber(blockWithHexValues.difficulty), - totalDifficulty: utils.convertAmountToBigNumber(blockWithHexValues.totalDifficulty), - transactions: [] as Transaction[], - }; - block.transactions = _.map(blockWithHexValues.transactions, (tx: TransactionRPC) => { - const transaction = marshaller.unmarshalTransaction(tx); - return transaction; - }); - return block; - }, - /** - * Unmarshall transaction - * @param txRpc transaction to unmarshall - * @return unmarshalled transaction - */ - unmarshalTransaction(txRpc: TransactionRPC): Transaction { - const tx = { - ...txRpc, - blockNumber: !_.isNull(txRpc.blockNumber) ? utils.convertHexToNumber(txRpc.blockNumber) : null, - transactionIndex: !_.isNull(txRpc.transactionIndex) - ? utils.convertHexToNumber(txRpc.transactionIndex) - : null, - nonce: utils.convertHexToNumber(txRpc.nonce), - gas: utils.convertHexToNumber(txRpc.gas), - gasPrice: utils.convertAmountToBigNumber(txRpc.gasPrice), - value: utils.convertAmountToBigNumber(txRpc.value), - }; - return tx; - }, - /** - * Unmarshall transaction receipt - * @param txReceiptRpc transaction receipt to unmarshall - * @return unmarshalled transaction receipt - */ - unmarshalTransactionReceipt(txReceiptRpc: TransactionReceiptRPC): TransactionReceipt { - const txReceipt = { - ...txReceiptRpc, - blockNumber: utils.convertHexToNumber(txReceiptRpc.blockNumber), - transactionIndex: utils.convertHexToNumber(txReceiptRpc.transactionIndex), - cumulativeGasUsed: utils.convertHexToNumber(txReceiptRpc.cumulativeGasUsed), - gasUsed: utils.convertHexToNumber(txReceiptRpc.gasUsed), - logs: _.map(txReceiptRpc.logs, marshaller.unmarshalLog.bind(marshaller)), - }; - return txReceipt; - }, - /** - * Unmarshall transaction data - * @param txDataRpc transaction data to unmarshall - * @return unmarshalled transaction data - */ - unmarshalTxData(txDataRpc: TxDataRPC): TxData { - if (_.isUndefined(txDataRpc.from)) { - throw new Error(`txData must include valid 'from' value.`); - } - const txData = { - ...txDataRpc, - value: !_.isUndefined(txDataRpc.value) ? utils.convertAmountToBigNumber(txDataRpc.value) : undefined, - gas: !_.isUndefined(txDataRpc.gas) ? utils.convertHexToNumber(txDataRpc.gas) : undefined, - gasPrice: !_.isUndefined(txDataRpc.gasPrice) - ? utils.convertAmountToBigNumber(txDataRpc.gasPrice) - : undefined, - nonce: !_.isUndefined(txDataRpc.nonce) ? utils.convertHexToNumber(txDataRpc.nonce) : undefined, - }; - return txData; - }, - /** - * Marshall transaction data - * @param txData transaction data to marshall - * @return marshalled transaction data - */ - marshalTxData(txData: Partial): Partial { - if (_.isUndefined(txData.from)) { - throw new Error(`txData must include valid 'from' value.`); - } - const callTxDataBase = { - ...txData, - }; - delete callTxDataBase.from; - const callTxDataBaseRPC = marshaller._marshalCallTxDataBase(callTxDataBase); - const txDataRPC = { - ...callTxDataBaseRPC, - from: marshaller.marshalAddress(txData.from), - }; - const prunableIfUndefined = ['gasPrice', 'gas', 'value', 'nonce']; - _.each(txDataRPC, (value: any, key: string) => { - if (_.isUndefined(value) && _.includes(prunableIfUndefined, key)) { - delete (txDataRPC as any)[key]; - } - }); - return txDataRPC; - }, - /** - * Marshall call data - * @param callData call data to marshall - * @return marshalled call data - */ - marshalCallData(callData: Partial): Partial { - const callTxDataBase = { - ...callData, - }; - delete callTxDataBase.from; - const callTxDataBaseRPC = marshaller._marshalCallTxDataBase(callTxDataBase); - const callDataRPC = { - ...callTxDataBaseRPC, - from: _.isUndefined(callData.from) ? undefined : marshaller.marshalAddress(callData.from), - }; - return callDataRPC; - }, - /** - * Marshall address - * @param address address to marshall - * @return marshalled address - */ - marshalAddress(address: string): string { - if (addressUtils.isAddress(address)) { - return ethUtil.addHexPrefix(address); - } - throw new Error(`Invalid address encountered: ${address}`); - }, - /** - * Marshall block param - * @param blockParam block param to marshall - * @return marshalled block param - */ - marshalBlockParam(blockParam: BlockParam | string | number | undefined): string | undefined { - if (_.isUndefined(blockParam)) { - return BlockParamLiteral.Latest; - } - const encodedBlockParam = _.isNumber(blockParam) ? utils.numberToHex(blockParam) : blockParam; - return encodedBlockParam; - }, - /** - * Unmarshall log - * @param rawLog log to unmarshall - * @return unmarshalled log - */ - unmarshalLog(rawLog: RawLogEntry): LogEntry { - const formattedLog = { - ...rawLog, - logIndex: utils.convertHexToNumberOrNull(rawLog.logIndex), - blockNumber: utils.convertHexToNumberOrNull(rawLog.blockNumber), - transactionIndex: utils.convertHexToNumberOrNull(rawLog.transactionIndex), - }; - return formattedLog; - }, - _marshalCallTxDataBase(callTxDataBase: Partial): Partial { - const callTxDataBaseRPC = { - ...callTxDataBase, - to: _.isUndefined(callTxDataBase.to) ? undefined : marshaller.marshalAddress(callTxDataBase.to), - gasPrice: _.isUndefined(callTxDataBase.gasPrice) - ? undefined - : utils.encodeAmountAsHexString(callTxDataBase.gasPrice), - gas: _.isUndefined(callTxDataBase.gas) ? undefined : utils.encodeAmountAsHexString(callTxDataBase.gas), - value: _.isUndefined(callTxDataBase.value) - ? undefined - : utils.encodeAmountAsHexString(callTxDataBase.value), - nonce: _.isUndefined(callTxDataBase.nonce) - ? undefined - : utils.encodeAmountAsHexString(callTxDataBase.nonce), - }; - - return callTxDataBaseRPC; - }, -}; diff --git a/packages/web3-wrapper/src/types.ts b/packages/web3-wrapper/src/types.ts deleted file mode 100644 index eb5a35f07..000000000 --- a/packages/web3-wrapper/src/types.ts +++ /dev/null @@ -1,92 +0,0 @@ -export enum Web3WrapperErrors { - TransactionMiningTimeout = 'TRANSACTION_MINING_TIMEOUT', -} - -export interface AbstractBlockRPC { - number: string | null; - hash: string | null; - parentHash: string; - nonce: string | null; - sha3Uncles: string; - logsBloom: string | null; - transactionsRoot: string; - stateRoot: string; - miner: string; - difficulty: string; - totalDifficulty: string; - extraData: string; - size: string; - gasLimit: string; - gasUsed: string; - timestamp: string; - uncles: string[]; -} -export interface BlockWithoutTransactionDataRPC extends AbstractBlockRPC { - transactions: string[]; -} -export interface BlockWithTransactionDataRPC extends AbstractBlockRPC { - transactions: TransactionRPC[]; -} -export interface TransactionRPC { - hash: string; - nonce: string; - blockHash: string | null; - blockNumber: string | null; - transactionIndex: string | null; - from: string; - to: string | null; - value: string; - gasPrice: string; - gas: string; - input: string; -} - -export interface TransactionReceiptRPC { - blockHash: string; - blockNumber: string; - transactionHash: string; - transactionIndex: string; - from: string; - to: string; - status: TransactionReceiptStatusRPC; - cumulativeGasUsed: string; - gasUsed: string; - contractAddress: string | null; - logs: LogEntryRPC[]; -} - -export interface LogEntryRPC { - logIndex: string | null; - transactionIndex: string | null; - transactionHash: string; - blockHash: string | null; - blockNumber: string | null; - address: string; - data: string; - topics: string[]; -} - -export type TransactionReceiptStatusRPC = null | string | 0 | 1; - -export interface CallTxDataBaseRPC { - to?: string; - value?: string; - gas?: string; - gasPrice?: string; - data?: string; - nonce?: string; -} - -export interface TxDataRPC extends CallTxDataBaseRPC { - from: string; -} - -export interface CallDataRPC extends CallTxDataBaseRPC { - from?: string; -} - -// NodeType represents the type of the backing Ethereum node. -export enum NodeType { - Geth = 'GETH', - Ganache = 'GANACHE', -} diff --git a/packages/web3-wrapper/src/utils.ts b/packages/web3-wrapper/src/utils.ts deleted file mode 100644 index 1aba3c75a..000000000 --- a/packages/web3-wrapper/src/utils.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { BigNumber } from '@0x/utils'; -import * as _ from 'lodash'; - -export const utils = { - convertHexToNumber(value: string): number { - const valueBigNumber = new BigNumber(value); - const valueNumber = valueBigNumber.toNumber(); - return valueNumber; - }, - convertHexToNumberOrNull(hex: string | null): number | null { - if (_.isNull(hex)) { - return null; - } - const decimal = utils.convertHexToNumber(hex); - return decimal; - }, - convertAmountToBigNumber(value: string | number | BigNumber): BigNumber { - const num = value || 0; - const isBigNumber = BigNumber.isBigNumber(num); - if (isBigNumber) { - return num as BigNumber; - } - - if (_.isString(num) && (num.indexOf('0x') === 0 || num.indexOf('-0x') === 0)) { - return new BigNumber(num.replace('0x', ''), 16); - } - - const baseTen = 10; - return new BigNumber((num as number).toString(baseTen), baseTen); - }, - encodeAmountAsHexString(value: string | number | BigNumber): string { - const valueBigNumber = utils.convertAmountToBigNumber(value); - const hexBase = 16; - const valueHex = valueBigNumber.toString(hexBase); - - return valueBigNumber.isLessThan(0) ? `-0x${valueHex.substr(1)}` : `0x${valueHex}`; - }, - numberToHex(value: number): string { - if (!isFinite(value) && !utils.isHexStrict(value)) { - throw new Error(`Given input ${value} is not a number.`); - } - - const valueBigNumber = new BigNumber(value); - const hexBase = 16; - const result = valueBigNumber.toString(hexBase); - - return valueBigNumber.lt(0) ? `-0x${result.substr(1)}` : `0x${result}`; - }, - isHexStrict(hex: string | number): boolean { - return ( - (_.isString(hex) || _.isNumber(hex)) && /^(-)?0x[0-9a-f]*$/i.test(_.isNumber(hex) ? hex.toString() : hex) - ); - }, -}; diff --git a/packages/web3-wrapper/src/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts deleted file mode 100644 index 76cae4b01..000000000 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ /dev/null @@ -1,703 +0,0 @@ -import { assert } from '@0x/assert'; -import { schemas } from '@0x/json-schemas'; -import { AbiDecoder, addressUtils, BigNumber, intervalUtils, promisify } from '@0x/utils'; -import { - BlockParam, - BlockParamLiteral, - BlockWithoutTransactionData, - BlockWithTransactionData, - CallData, - FilterObject, - JSONRPCRequestPayload, - JSONRPCResponsePayload, - LogEntry, - Provider, - RawLogEntry, - TraceParams, - Transaction, - TransactionReceipt, - TransactionReceiptWithDecodedLogs, - TransactionTrace, - TxData, -} from 'ethereum-types'; -import * as _ from 'lodash'; - -import { marshaller } from './marshaller'; -import { - BlockWithoutTransactionDataRPC, - BlockWithTransactionDataRPC, - NodeType, - TransactionReceiptRPC, - TransactionRPC, - Web3WrapperErrors, -} from './types'; -import { utils } from './utils'; - -const BASE_TEN = 10; - -// These are unique identifiers contained in the response of the -// web3_clientVersion call. -const uniqueVersionIds = { - geth: 'Geth', - ganache: 'EthereumJS TestRPC', -}; - -/** - * An alternative to the Web3.js library that provides a consistent, clean, promise-based interface. - */ -export class Web3Wrapper { - /** - * Flag to check if this instance is of type Web3Wrapper - */ - public isZeroExWeb3Wrapper = true; - public abiDecoder: AbiDecoder; - private _provider: Provider; - private readonly _txDefaults: Partial; - private _jsonRpcRequestId: number; - /** - * Check if an address is a valid Ethereum address - * @param address Address to check - * @returns Whether the address is a valid Ethereum address - */ - public static isAddress(address: string): boolean { - return addressUtils.isAddress(address); - } - /** - * A unit amount is defined as the amount of a token above the specified decimal places (integer part). - * E.g: If a currency has 18 decimal places, 1e18 or one quintillion of the currency is equivalent - * to 1 unit. - * @param amount The amount in baseUnits that you would like converted to units. - * @param decimals The number of decimal places the unit amount has. - * @return The amount in units. - */ - public static toUnitAmount(amount: BigNumber, decimals: number): BigNumber { - assert.isValidBaseUnitAmount('amount', amount); - assert.isNumber('decimals', decimals); - const aUnit = new BigNumber(BASE_TEN).pow(decimals); - const unit = amount.div(aUnit); - return unit; - } - /** - * A baseUnit is defined as the smallest denomination of a token. An amount expressed in baseUnits - * is the amount expressed in the smallest denomination. - * E.g: 1 unit of a token with 18 decimal places is expressed in baseUnits as 1000000000000000000 - * @param amount The amount of units that you would like converted to baseUnits. - * @param decimals The number of decimal places the unit amount has. - * @return The amount in baseUnits. - */ - public static toBaseUnitAmount(amount: BigNumber, decimals: number): BigNumber { - assert.isBigNumber('amount', amount); - assert.isNumber('decimals', decimals); - const unit = new BigNumber(BASE_TEN).pow(decimals); - const baseUnitAmount = amount.times(unit); - const hasDecimals = baseUnitAmount.decimalPlaces() !== 0; - if (hasDecimals) { - throw new Error(`Invalid unit amount: ${amount.toString()} - Too many decimal places`); - } - return baseUnitAmount; - } - /** - * Convert an Ether amount from ETH to Wei - * @param ethAmount Amount of Ether to convert to wei - * @returns Amount in wei - */ - public static toWei(ethAmount: BigNumber): BigNumber { - assert.isBigNumber('ethAmount', ethAmount); - const ETH_DECIMALS = 18; - const balanceWei = Web3Wrapper.toBaseUnitAmount(ethAmount, ETH_DECIMALS); - return balanceWei; - } - private static _assertBlockParam(blockParam: string | BlockParam): void { - if (_.isNumber(blockParam)) { - return; - } else if (_.isString(blockParam)) { - assert.doesBelongToStringEnum('blockParam', blockParam, BlockParamLiteral); - } - } - private static _assertBlockParamOrString(blockParam: string | BlockParam): void { - try { - Web3Wrapper._assertBlockParam(blockParam); - } catch (err) { - try { - assert.isHexString('blockParam', blockParam as string); - return; - } catch (err) { - throw new Error(`Expected blockParam to be of type "string | BlockParam", encountered ${blockParam}`); - } - } - } - private static _normalizeTxReceiptStatus(status: undefined | null | string | 0 | 1): null | 0 | 1 { - // Transaction status might have four values - // undefined - Testrpc and other old clients - // null - New clients on old transactions - // number - Parity - // hex - Geth - if (_.isString(status)) { - return utils.convertHexToNumber(status) as 0 | 1; - } else if (_.isUndefined(status)) { - return null; - } else { - return status; - } - } - /** - * Instantiates a new Web3Wrapper. - * @param provider The Web3 provider instance you would like the Web3Wrapper to use for interacting with - * the backing Ethereum node. - * @param txDefaults Override TxData defaults sent with RPC requests to the backing Ethereum node. - * @return An instance of the Web3Wrapper class. - */ - constructor(provider: Provider, txDefaults?: Partial) { - assert.isWeb3Provider('provider', provider); - if (_.isUndefined((provider as any).sendAsync)) { - // Web3@1.0 provider doesn't support synchronous http requests, - // so it only has an async `send` method, instead of a `send` and `sendAsync` in web3@0.x.x` - // We re-assign the send method so that Web3@1.0 providers work with @0x/web3-wrapper - (provider as any).sendAsync = (provider as any).send; - } - this.abiDecoder = new AbiDecoder([]); - this._provider = provider; - this._txDefaults = txDefaults || {}; - this._jsonRpcRequestId = 1; - } - /** - * Get the contract defaults set to the Web3Wrapper instance - * @return TxData defaults (e.g gas, gasPrice, nonce, etc...) - */ - public getContractDefaults(): Partial { - return this._txDefaults; - } - /** - * Retrieve the Web3 provider - * @return Web3 provider instance - */ - public getProvider(): Provider { - return this._provider; - } - /** - * Update the used Web3 provider - * @param provider The new Web3 provider to be set - */ - public setProvider(provider: Provider): void { - assert.isWeb3Provider('provider', provider); - this._provider = provider; - } - /** - * Check whether an address is available through the backing provider. This can be - * useful if you want to know whether a user can sign messages or transactions from - * a given Ethereum address. - * @param senderAddress Address to check availability for - * @returns Whether the address is available through the provider. - */ - public async isSenderAddressAvailableAsync(senderAddress: string): Promise { - assert.isETHAddressHex('senderAddress', senderAddress); - const addresses = await this.getAvailableAddressesAsync(); - const normalizedAddress = senderAddress.toLowerCase(); - return _.includes(addresses, normalizedAddress); - } - /** - * Fetch the backing Ethereum node's version string (e.g `MetaMask/v4.2.0`) - * @returns Ethereum node's version string - */ - public async getNodeVersionAsync(): Promise { - const nodeVersion = await this.sendRawPayloadAsync({ method: 'web3_clientVersion' }); - return nodeVersion; - } - /** - * Fetches the networkId of the backing Ethereum node - * @returns The network id - */ - public async getNetworkIdAsync(): Promise { - const networkIdStr = await this.sendRawPayloadAsync({ method: 'net_version' }); - const networkId = _.parseInt(networkIdStr); - return networkId; - } - /** - * Retrieves the transaction receipt for a given transaction hash if found - * @param txHash Transaction hash - * @returns The transaction receipt, including it's status (0: failed, 1: succeeded). Returns undefined if transaction not found. - */ - public async getTransactionReceiptIfExistsAsync(txHash: string): Promise { - assert.isHexString('txHash', txHash); - const transactionReceiptRpc = await this.sendRawPayloadAsync({ - method: 'eth_getTransactionReceipt', - params: [txHash], - }); - // HACK Parity can return a pending transaction receipt. We check for a non null - // block number before continuing with returning a fully realised receipt. - // ref: https://github.com/paritytech/parity-ethereum/issues/1180 - if (!_.isNull(transactionReceiptRpc) && !_.isNull(transactionReceiptRpc.blockNumber)) { - transactionReceiptRpc.status = Web3Wrapper._normalizeTxReceiptStatus(transactionReceiptRpc.status); - const transactionReceipt = marshaller.unmarshalTransactionReceipt(transactionReceiptRpc); - return transactionReceipt; - } else { - return undefined; - } - } - /** - * Retrieves the transaction data for a given transaction - * @param txHash Transaction hash - * @returns The raw transaction data - */ - public async getTransactionByHashAsync(txHash: string): Promise { - assert.isHexString('txHash', txHash); - const transactionRpc = await this.sendRawPayloadAsync({ - method: 'eth_getTransactionByHash', - params: [txHash], - }); - const transaction = marshaller.unmarshalTransaction(transactionRpc); - return transaction; - } - /** - * Retrieves an accounts Ether balance in wei - * @param owner Account whose balance you wish to check - * @param defaultBlock The block depth at which to fetch the balance (default=latest) - * @returns Balance in wei - */ - public async getBalanceInWeiAsync(owner: string, defaultBlock?: BlockParam): Promise { - assert.isETHAddressHex('owner', owner); - if (!_.isUndefined(defaultBlock)) { - Web3Wrapper._assertBlockParam(defaultBlock); - } - const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock); - const encodedOwner = marshaller.marshalAddress(owner); - const balanceInWei = await this.sendRawPayloadAsync({ - method: 'eth_getBalance', - params: [encodedOwner, marshalledDefaultBlock], - }); - // Rewrap in a new BigNumber - return new BigNumber(balanceInWei); - } - /** - * Check if a contract exists at a given address - * @param address Address to which to check - * @returns Whether or not contract code was found at the supplied address - */ - public async doesContractExistAtAddressAsync(address: string): Promise { - assert.isETHAddressHex('address', address); - const code = await this.getContractCodeAsync(address); - // Regex matches 0x0, 0x00, 0x in order to accommodate poorly implemented clients - const isCodeEmpty = /^0x0{0,40}$/i.test(code); - return !isCodeEmpty; - } - /** - * Gets the contract code by address - * @param address Address of the contract - * @param defaultBlock Block height at which to make the call. Defaults to `latest` - * @return Code of the contract - */ - public async getContractCodeAsync(address: string, defaultBlock?: BlockParam): Promise { - assert.isETHAddressHex('address', address); - if (!_.isUndefined(defaultBlock)) { - Web3Wrapper._assertBlockParam(defaultBlock); - } - const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock); - const encodedAddress = marshaller.marshalAddress(address); - const code = await this.sendRawPayloadAsync({ - method: 'eth_getCode', - params: [encodedAddress, marshalledDefaultBlock], - }); - return code; - } - /** - * Gets the debug trace of a transaction - * @param txHash Hash of the transactuon to get a trace for - * @param traceParams Config object allowing you to specify if you need memory/storage/stack traces. - * @return Transaction trace - */ - public async getTransactionTraceAsync(txHash: string, traceParams: TraceParams): Promise { - assert.isHexString('txHash', txHash); - const trace = await this.sendRawPayloadAsync({ - method: 'debug_traceTransaction', - params: [txHash, traceParams], - }); - return trace; - } - /** - * Sign a message with a specific address's private key (`eth_sign`) - * @param address Address of signer - * @param message Message to sign - * @returns Signature string (might be VRS or RSV depending on the Signer) - */ - public async signMessageAsync(address: string, message: string): Promise { - assert.isETHAddressHex('address', address); - assert.isString('message', message); // TODO: Should this be stricter? Hex string? - const signData = await this.sendRawPayloadAsync({ - method: 'eth_sign', - params: [address, message], - }); - return signData; - } - /** - * Sign an EIP712 typed data message with a specific address's private key (`eth_signTypedData`) - * @param address Address of signer - * @param typedData Typed data message to sign - * @returns Signature string (as RSV) - */ - public async signTypedDataAsync(address: string, typedData: any): Promise { - assert.isETHAddressHex('address', address); - assert.doesConformToSchema('typedData', typedData, schemas.eip712TypedDataSchema); - const signData = await this.sendRawPayloadAsync({ - method: 'eth_signTypedData', - params: [address, typedData], - }); - return signData; - } - /** - * Fetches the latest block number - * @returns Block number - */ - public async getBlockNumberAsync(): Promise { - const blockNumberHex = await this.sendRawPayloadAsync({ - method: 'eth_blockNumber', - params: [], - }); - const blockNumber = utils.convertHexToNumberOrNull(blockNumberHex); - return blockNumber as number; - } - /** - * Fetch a specific Ethereum block without transaction data - * @param blockParam The block you wish to fetch (blockHash, blockNumber or blockLiteral) - * @returns The requested block without transaction data, or undefined if block was not found - * (e.g the node isn't fully synced, there was a block re-org and the requested block was uncles, etc...) - */ - public async getBlockIfExistsAsync( - blockParam: string | BlockParam, - ): Promise { - Web3Wrapper._assertBlockParamOrString(blockParam); - const encodedBlockParam = marshaller.marshalBlockParam(blockParam); - const method = utils.isHexStrict(blockParam) ? 'eth_getBlockByHash' : 'eth_getBlockByNumber'; - const shouldIncludeTransactionData = false; - const blockWithoutTransactionDataWithHexValuesOrNull = await this.sendRawPayloadAsync< - BlockWithoutTransactionDataRPC - >({ - method, - params: [encodedBlockParam, shouldIncludeTransactionData], - }); - let blockWithoutTransactionDataIfExists; - if (!_.isNull(blockWithoutTransactionDataWithHexValuesOrNull)) { - blockWithoutTransactionDataIfExists = marshaller.unmarshalIntoBlockWithoutTransactionData( - blockWithoutTransactionDataWithHexValuesOrNull, - ); - } - return blockWithoutTransactionDataIfExists; - } - /** - * Fetch a specific Ethereum block with transaction data - * @param blockParam The block you wish to fetch (blockHash, blockNumber or blockLiteral) - * @returns The requested block with transaction data - */ - public async getBlockWithTransactionDataAsync(blockParam: string | BlockParam): Promise { - Web3Wrapper._assertBlockParamOrString(blockParam); - let encodedBlockParam = blockParam; - if (_.isNumber(blockParam)) { - encodedBlockParam = utils.numberToHex(blockParam); - } - const method = utils.isHexStrict(blockParam) ? 'eth_getBlockByHash' : 'eth_getBlockByNumber'; - const shouldIncludeTransactionData = true; - const blockWithTransactionDataWithHexValues = await this.sendRawPayloadAsync({ - method, - params: [encodedBlockParam, shouldIncludeTransactionData], - }); - const blockWithoutTransactionData = marshaller.unmarshalIntoBlockWithTransactionData( - blockWithTransactionDataWithHexValues, - ); - return blockWithoutTransactionData; - } - /** - * Fetch a block's timestamp - * @param blockParam The block you wish to fetch (blockHash, blockNumber or blockLiteral) - * @returns The block's timestamp - */ - public async getBlockTimestampAsync(blockParam: string | BlockParam): Promise { - Web3Wrapper._assertBlockParamOrString(blockParam); - const blockIfExists = await this.getBlockIfExistsAsync(blockParam); - if (_.isUndefined(blockIfExists)) { - throw new Error(`Failed to fetch block with blockParam: ${JSON.stringify(blockParam)}`); - } - return blockIfExists.timestamp; - } - /** - * Retrieve the user addresses available through the backing provider - * @returns Available user addresses - */ - public async getAvailableAddressesAsync(): Promise { - const addresses = await this.sendRawPayloadAsync({ - method: 'eth_accounts', - params: [], - }); - const normalizedAddresses = _.map(addresses, address => address.toLowerCase()); - return normalizedAddresses; - } - /** - * Take a snapshot of the blockchain state on a TestRPC/Ganache local node - * @returns The snapshot id. This can be used to revert to this snapshot - */ - public async takeSnapshotAsync(): Promise { - const snapshotId = Number(await this.sendRawPayloadAsync({ method: 'evm_snapshot', params: [] })); - return snapshotId; - } - /** - * Revert the blockchain state to a previous snapshot state on TestRPC/Ganache local node - * @param snapshotId snapshot id to revert to - * @returns Whether the revert was successful - */ - public async revertSnapshotAsync(snapshotId: number): Promise { - assert.isNumber('snapshotId', snapshotId); - const didRevert = await this.sendRawPayloadAsync({ method: 'evm_revert', params: [snapshotId] }); - return didRevert; - } - /** - * Mine a block on a TestRPC/Ganache local node - */ - public async mineBlockAsync(): Promise { - await this.sendRawPayloadAsync({ method: 'evm_mine', params: [] }); - } - /** - * Increase the next blocks timestamp on TestRPC/Ganache or Geth local node. - * Will throw if provider is neither TestRPC/Ganache or Geth. - * @param timeDelta Amount of time to add in seconds - */ - public async increaseTimeAsync(timeDelta: number): Promise { - assert.isNumber('timeDelta', timeDelta); - // Detect Geth vs. Ganache and use appropriate endpoint. - const version = await this.getNodeVersionAsync(); - if (_.includes(version, uniqueVersionIds.geth)) { - return this.sendRawPayloadAsync({ method: 'debug_increaseTime', params: [timeDelta] }); - } else if (_.includes(version, uniqueVersionIds.ganache)) { - return this.sendRawPayloadAsync({ method: 'evm_increaseTime', params: [timeDelta] }); - } else { - throw new Error(`Unknown client version: ${version}`); - } - } - /** - * Retrieve smart contract logs for a given filter - * @param filter Parameters by which to filter which logs to retrieve - * @returns The corresponding log entries - */ - public async getLogsAsync(filter: FilterObject): Promise { - if (!_.isUndefined(filter.blockHash) && (!_.isUndefined(filter.fromBlock) || !_.isUndefined(filter.toBlock))) { - throw new Error( - `Cannot specify 'blockHash' as well as 'fromBlock'/'toBlock' in the filter supplied to 'getLogsAsync'`, - ); - } - - let fromBlock = filter.fromBlock; - if (_.isNumber(fromBlock)) { - fromBlock = utils.numberToHex(fromBlock); - } - let toBlock = filter.toBlock; - if (_.isNumber(toBlock)) { - toBlock = utils.numberToHex(toBlock); - } - const serializedFilter = { - ...filter, - fromBlock, - toBlock, - }; - const payload = { - method: 'eth_getLogs', - params: [serializedFilter], - }; - const rawLogs = await this.sendRawPayloadAsync(payload); - const formattedLogs = _.map(rawLogs, marshaller.unmarshalLog.bind(marshaller)); - return formattedLogs; - } - /** - * Calculate the estimated gas cost for a given transaction - * @param txData Transaction data - * @returns Estimated gas cost - */ - public async estimateGasAsync(txData: Partial): Promise { - assert.doesConformToSchema('txData', txData, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); - const txDataHex = marshaller.marshalTxData(txData); - const gasHex = await this.sendRawPayloadAsync({ method: 'eth_estimateGas', params: [txDataHex] }); - const gas = utils.convertHexToNumber(gasHex); - return gas; - } - /** - * Call a smart contract method at a given block height - * @param callData Call data - * @param defaultBlock Block height at which to make the call. Defaults to `latest` - * @returns The raw call result - */ - public async callAsync(callData: CallData, defaultBlock?: BlockParam): Promise { - assert.doesConformToSchema('callData', callData, schemas.callDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); - if (!_.isUndefined(defaultBlock)) { - Web3Wrapper._assertBlockParam(defaultBlock); - } - const marshalledDefaultBlock = marshaller.marshalBlockParam(defaultBlock); - const callDataHex = marshaller.marshalCallData(callData); - const rawCallResult = await this.sendRawPayloadAsync({ - method: 'eth_call', - params: [callDataHex, marshalledDefaultBlock], - }); - return rawCallResult; - } - /** - * Send a transaction - * @param txData Transaction data - * @returns Transaction hash - */ - public async sendTransactionAsync(txData: TxData): Promise { - assert.doesConformToSchema('txData', txData, schemas.txDataSchema, [ - schemas.addressSchema, - schemas.numberSchema, - schemas.jsNumber, - ]); - const txDataHex = marshaller.marshalTxData(txData); - const txHash = await this.sendRawPayloadAsync({ method: 'eth_sendTransaction', params: [txDataHex] }); - return txHash; - } - /** - * Waits for a transaction to be mined and returns the transaction receipt. - * Note that just because a transaction was mined does not mean it was - * successful. You need to check the status code of the transaction receipt - * to find out if it was successful, or use the helper method - * awaitTransactionSuccessAsync. - * @param txHash Transaction hash - * @param pollingIntervalMs How often (in ms) should we check if the transaction is mined. - * @param timeoutMs How long (in ms) to poll for transaction mined until aborting. - * @return Transaction receipt with decoded log args. - */ - public async awaitTransactionMinedAsync( - txHash: string, - pollingIntervalMs: number = 1000, - timeoutMs?: number, - ): Promise { - assert.isHexString('txHash', txHash); - assert.isNumber('pollingIntervalMs', pollingIntervalMs); - if (!_.isUndefined(timeoutMs)) { - assert.isNumber('timeoutMs', timeoutMs); - } - // Immediately check if the transaction has already been mined. - let transactionReceipt = await this.getTransactionReceiptIfExistsAsync(txHash); - if (!_.isUndefined(transactionReceipt)) { - const logsWithDecodedArgs = _.map( - transactionReceipt.logs, - this.abiDecoder.tryToDecodeLogOrNoop.bind(this.abiDecoder), - ); - const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = { - ...transactionReceipt, - logs: logsWithDecodedArgs, - }; - return transactionReceiptWithDecodedLogArgs; - } - - // Otherwise, check again every pollingIntervalMs. - let wasTimeoutExceeded = false; - if (timeoutMs) { - setTimeout(() => (wasTimeoutExceeded = true), timeoutMs); - } - - const txReceiptPromise = new Promise( - (resolve: (receipt: TransactionReceiptWithDecodedLogs) => void, reject) => { - const intervalId = intervalUtils.setAsyncExcludingInterval( - async () => { - if (wasTimeoutExceeded) { - intervalUtils.clearAsyncExcludingInterval(intervalId); - return reject(Web3WrapperErrors.TransactionMiningTimeout); - } - - transactionReceipt = await this.getTransactionReceiptIfExistsAsync(txHash); - if (!_.isUndefined(transactionReceipt)) { - intervalUtils.clearAsyncExcludingInterval(intervalId); - const logsWithDecodedArgs = _.map( - transactionReceipt.logs, - this.abiDecoder.tryToDecodeLogOrNoop.bind(this.abiDecoder), - ); - const transactionReceiptWithDecodedLogArgs: TransactionReceiptWithDecodedLogs = { - ...transactionReceipt, - logs: logsWithDecodedArgs, - }; - resolve(transactionReceiptWithDecodedLogArgs); - } - }, - pollingIntervalMs, - (err: Error) => { - intervalUtils.clearAsyncExcludingInterval(intervalId); - reject(err); - }, - ); - }, - ); - const txReceipt = await txReceiptPromise; - return txReceipt; - } - /** - * Waits for a transaction to be mined and returns the transaction receipt. - * Unlike awaitTransactionMinedAsync, it will throw if the receipt has a - * status that is not equal to 1. A status of 0 or null indicates that the - * transaction was mined, but failed. See: - * https://github.com/ethereum/wiki/wiki/JavaScript-API#web3ethgettransactionreceipt - * @param txHash Transaction hash - * @param pollingIntervalMs How often (in ms) should we check if the transaction is mined. - * @param timeoutMs How long (in ms) to poll for transaction mined until aborting. - * @return Transaction receipt with decoded log args. - */ - public async awaitTransactionSuccessAsync( - txHash: string, - pollingIntervalMs: number = 1000, - timeoutMs?: number, - ): Promise { - const receipt = await this.awaitTransactionMinedAsync(txHash, pollingIntervalMs, timeoutMs); - if (receipt.status !== 1) { - throw new Error(`Transaction failed: ${txHash}`); - } - return receipt; - } - /** - * Calls the 'debug_setHead' JSON RPC method, which sets the current head of - * the local chain by block number. Note, this is a destructive action and - * may severely damage your chain. Use with extreme caution. As of now, this - * is only supported by Geth. It sill throw if the 'debug_setHead' method is - * not supported. - * @param blockNumber The block number to reset to. - */ - public async setHeadAsync(blockNumber: number): Promise { - assert.isNumber('blockNumber', blockNumber); - await this.sendRawPayloadAsync({ method: 'debug_setHead', params: [utils.numberToHex(blockNumber)] }); - } - /** - * Sends a raw Ethereum JSON RPC payload and returns the response's `result` key - * @param payload A partial JSON RPC payload. No need to include version, id, params (if none needed) - * @return The contents nested under the result key of the response body - */ - public async sendRawPayloadAsync(payload: Partial): Promise { - const sendAsync = this._provider.sendAsync.bind(this._provider); - const payloadWithDefaults = { - id: this._jsonRpcRequestId++, - params: [], - jsonrpc: '2.0', - ...payload, - }; - const response = await promisify(sendAsync)(payloadWithDefaults); - if (response.error) { - throw new Error(response.error.message); - } - const result = response.result; - return result; - } - /** - * Returns either NodeType.Geth or NodeType.Ganache depending on the type of - * the backing Ethereum node. Throws for any other type of node. - */ - public async getNodeTypeAsync(): Promise { - const version = await this.getNodeVersionAsync(); - if (_.includes(version, uniqueVersionIds.geth)) { - return NodeType.Geth; - } else if (_.includes(version, uniqueVersionIds.ganache)) { - return NodeType.Ganache; - } else { - throw new Error(`Unknown client version: ${version}`); - } - } -} // tslint:disable-line:max-file-line-count diff --git a/packages/web3-wrapper/test/utils/chai_setup.ts b/packages/web3-wrapper/test/utils/chai_setup.ts deleted file mode 100644 index 1a8733093..000000000 --- a/packages/web3-wrapper/test/utils/chai_setup.ts +++ /dev/null @@ -1,13 +0,0 @@ -import * as chai from 'chai'; -import chaiAsPromised = require('chai-as-promised'); -import ChaiBigNumber = require('chai-bignumber'); -import * as dirtyChai from 'dirty-chai'; - -export const chaiSetup = { - configure(): void { - chai.config.includeStack = true; - chai.use(ChaiBigNumber()); - chai.use(dirtyChai); - chai.use(chaiAsPromised); - }, -}; diff --git a/packages/web3-wrapper/test/web3_wrapper_test.ts b/packages/web3-wrapper/test/web3_wrapper_test.ts deleted file mode 100644 index c4ee91d3d..000000000 --- a/packages/web3-wrapper/test/web3_wrapper_test.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { BigNumber } from '@0x/utils'; -import * as chai from 'chai'; -import { BlockParamLiteral, JSONRPCErrorCallback, JSONRPCRequestPayload, TransactionReceipt } from 'ethereum-types'; -import * as Ganache from 'ganache-core'; -import * as _ from 'lodash'; -import 'mocha'; - -import { Web3Wrapper } from '../src/web3_wrapper'; - -import { chaiSetup } from './utils/chai_setup'; -chaiSetup.configure(); - -const { expect } = chai; - -const NUM_GANACHE_ADDRESSES = 10; - -describe('Web3Wrapper tests', () => { - const NETWORK_ID = 50; - const provider = Ganache.provider({ network_id: NETWORK_ID }); - const web3Wrapper = new Web3Wrapper(provider); - let addresses: string[]; - before(async () => { - addresses = await web3Wrapper.getAvailableAddressesAsync(); - }); - describe('#isAddress', () => { - it('correctly checks if a string is a valid ethereum address', () => { - expect(Web3Wrapper.isAddress('0x0')).to.be.false(); - expect(Web3Wrapper.isAddress('0xdeadbeef')).to.be.false(); - expect(Web3Wrapper.isAddress('42')).to.be.false(); - expect(Web3Wrapper.isAddress('weth.thetoken.eth')).to.be.false(); - expect(Web3Wrapper.isAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2')).to.be.true(); - expect(Web3Wrapper.isAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2')).to.be.true(); - }); - }); - describe('#getNodeVersionAsync', () => { - it('gets the node version', async () => { - const nodeVersion = await web3Wrapper.getNodeVersionAsync(); - const NODE_VERSION = 'EthereumJS TestRPC/v2.3.3/ethereum-js'; - expect(nodeVersion).to.be.equal(NODE_VERSION); - }); - }); - describe('#getNetworkIdAsync', () => { - it('gets the network id', async () => { - const networkId = await web3Wrapper.getNetworkIdAsync(); - expect(networkId).to.be.equal(NETWORK_ID); - }); - }); - describe('#getNetworkIdAsync', () => { - it('gets the network id', async () => { - const networkId = await web3Wrapper.getNetworkIdAsync(); - expect(networkId).to.be.equal(NETWORK_ID); - }); - }); - describe('#getAvailableAddressesAsync', () => { - it('gets the available addresses', async () => { - const availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); - expect(availableAddresses.length).to.be.equal(NUM_GANACHE_ADDRESSES); - expect(Web3Wrapper.isAddress(availableAddresses[0])).to.equal(true); - }); - }); - describe('#getBalanceInWeiAsync', () => { - it('gets the users balance in wei', async () => { - const secondAccount = addresses[1]; - const balanceInWei = await web3Wrapper.getBalanceInWeiAsync(secondAccount); - const tenEthInWei = 100000000000000000000; - expect(balanceInWei).to.be.bignumber.equal(tenEthInWei); - }); - it('should throw if supplied owner not an Ethereum address hex string', async () => { - const invalidEthAddress = 'deadbeef'; - expect(web3Wrapper.getBalanceInWeiAsync(invalidEthAddress)).to.eventually.to.be.rejected(); - }); - }); - describe('#signMessageAsync', () => { - it('should sign message', async () => { - const message = '0xdeadbeef'; - const signer = addresses[1]; - const signature = await web3Wrapper.signMessageAsync(signer, message); - const signatureLength = 132; - expect(signature.length).to.be.equal(signatureLength); - }); - it('should throw if the provider returns an error', async () => { - const message = '0xdeadbeef'; - const signer = addresses[1]; - const fakeProvider = { - async sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): Promise { - callback(new Error('User denied message signature')); - }, - }; - const errorWeb3Wrapper = new Web3Wrapper(fakeProvider); - expect(errorWeb3Wrapper.signMessageAsync(signer, message)).to.be.rejectedWith( - 'User denied message signature', - ); - }); - }); - describe('#getBlockNumberAsync', () => { - it('get block number', async () => { - const blockNumber = await web3Wrapper.getBlockNumberAsync(); - expect(typeof blockNumber).to.be.equal('number'); - }); - }); - describe('#getTransactionReceiptAsync/awaitTransactionSuccessAsync', () => { - it('get block number', async () => { - const payload = { from: addresses[0], to: addresses[1], value: 1 }; - const txHash = await web3Wrapper.sendTransactionAsync(payload); - await web3Wrapper.awaitTransactionSuccessAsync(txHash); - const receiptIfExists = await web3Wrapper.getTransactionReceiptIfExistsAsync(txHash); - expect(receiptIfExists).to.not.be.undefined(); - const receipt = receiptIfExists as TransactionReceipt; - expect(receipt.transactionIndex).to.be.a('number'); - expect(receipt.transactionHash).to.be.equal(txHash); - }); - }); - describe('#getBlockIfExistsAsync', () => { - it('gets block when supplied a valid BlockParamLiteral value', async () => { - const blockParamLiteral = BlockParamLiteral.Earliest; - const blockIfExists = await web3Wrapper.getBlockIfExistsAsync(blockParamLiteral); - if (_.isUndefined(blockIfExists)) { - throw new Error('Expected block to exist'); - } - expect(blockIfExists.number).to.be.equal(0); - expect(BigNumber.isBigNumber(blockIfExists.difficulty)).to.equal(true); - expect(_.isNumber(blockIfExists.gasLimit)).to.equal(true); - }); - it('gets block when supplied a block number', async () => { - const blockParamLiteral = 0; - const blockIfExists = await web3Wrapper.getBlockIfExistsAsync(blockParamLiteral); - if (_.isUndefined(blockIfExists)) { - throw new Error('Expected block to exist'); - } - expect(blockIfExists.number).to.be.equal(0); - }); - it('gets block when supplied a block hash', async () => { - const blockParamLiteral = 0; - const blockIfExists = await web3Wrapper.getBlockIfExistsAsync(blockParamLiteral); - if (_.isUndefined(blockIfExists)) { - throw new Error('Expected block to exist'); - } - const sameBlockIfExists = await web3Wrapper.getBlockIfExistsAsync(blockIfExists.hash as string); - if (_.isUndefined(sameBlockIfExists)) { - throw new Error('Expected block to exist'); - } - expect(sameBlockIfExists.number).to.be.equal(0); - }); - it('should throw if supplied invalid blockParam value', async () => { - const invalidBlockParam = 'deadbeef'; - expect(web3Wrapper.getBlockIfExistsAsync(invalidBlockParam)).to.eventually.to.be.rejected(); - }); - }); - describe('#getBlockWithTransactionDataAsync', () => { - it('gets block when supplied a valid BlockParamLiteral value', async () => { - const blockParamLiteral = BlockParamLiteral.Earliest; - const block = await web3Wrapper.getBlockWithTransactionDataAsync(blockParamLiteral); - expect(block.number).to.be.equal(0); - expect(BigNumber.isBigNumber(block.difficulty)).to.equal(true); - expect(_.isNumber(block.gasLimit)).to.equal(true); - }); - it('should throw if supplied invalid blockParam value', async () => { - const invalidBlockParam = 'deadbeef'; - expect(web3Wrapper.getBlockWithTransactionDataAsync(invalidBlockParam)).to.eventually.to.be.rejected(); - }); - }); - describe('#getBlockTimestampAsync', () => { - it('gets block timestamp', async () => { - const blockParamLiteral = BlockParamLiteral.Earliest; - const timestamp = await web3Wrapper.getBlockTimestampAsync(blockParamLiteral); - expect(_.isNumber(timestamp)).to.be.equal(true); - }); - }); -}); diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json deleted file mode 100644 index 718e623c7..000000000 --- a/packages/web3-wrapper/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig", - "compilerOptions": { - "outDir": "lib", - "rootDir": "." - }, - "include": ["src/**/*", "test/**/*"] -} diff --git a/packages/web3-wrapper/tslint.json b/packages/web3-wrapper/tslint.json deleted file mode 100644 index dd9053357..000000000 --- a/packages/web3-wrapper/tslint.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["@0x/tslint-config"] -} diff --git a/packages/web3-wrapper/typedoc-tsconfig.json b/packages/web3-wrapper/typedoc-tsconfig.json deleted file mode 100644 index b9c6b36f3..000000000 --- a/packages/web3-wrapper/typedoc-tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../typedoc-tsconfig", - "compilerOptions": { - "outDir": "lib" - }, - "include": ["src/**/*", "test/**/*"] -} -- cgit v1.2.3