diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-07-21 07:15:04 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-07-21 07:15:04 +0800 |
commit | 6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8 (patch) | |
tree | 7b6a6eb86d6a0463221a502fb886bae6ff5a243c /packages/web3-wrapper | |
parent | 938aabde3db0044c658e86765e1bbdbdce4e4a17 (diff) | |
parent | e54501522dcf93521c8ff7dfe5b216cffeaa1b29 (diff) | |
download | dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar.gz dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar.bz2 dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar.lz dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar.xz dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.tar.zst dexon-sol-tools-6ffa907f0ef3c94d3ea7d79d99a24939f62e0eb8.zip |
Merge branch 'v2-prototype' into feature/website/jobs-page-part2
* v2-prototype: (103 commits)
Add changelog entry for @0xproject/utils
Add AbortController polyfill to fetchAsync in utils
Increase node heap size for webpack command
Add missing timestamp to CHANGELOG entries
Upgrade some @0xproject packages to 1.0.0 in website
Hard code fillOrder selector into abiEncodeFillOrder
Returns byte array instead of memory range for encoding fillOrder calldata
Created LibAbiEncoder with `fillOrderNoThrow`
Add missing dep in migrations
Fix the abi-gen entry point
Fix linter error
Remove the postinstall hook
Update website package.json with original imports
@0xproject/sra-report@1.0.0
Change all package to depend on the new @0xproject/connect@1.0.0
@0xproject/connect@1.0.0
Use old assert version in @0xproject/connect
FIx a typo
Remove rc versions from unmigrated packages
0x.js@1.0.0-rc.2
...
Diffstat (limited to 'packages/web3-wrapper')
-rw-r--r-- | packages/web3-wrapper/CHANGELOG.json | 7 | ||||
-rw-r--r-- | packages/web3-wrapper/package.json | 16 | ||||
-rw-r--r-- | packages/web3-wrapper/src/index.ts | 4 | ||||
-rw-r--r-- | packages/web3-wrapper/src/types.ts | 6 | ||||
-rw-r--r-- | packages/web3-wrapper/src/web3_wrapper.ts | 10 |
5 files changed, 24 insertions, 19 deletions
diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 846e8320e..200836a82 100644 --- a/packages/web3-wrapper/CHANGELOG.json +++ b/packages/web3-wrapper/CHANGELOG.json @@ -1,6 +1,7 @@ [ { - "version": "0.7.3", + "timestamp": 1532043000, + "version": "1.0.0", "changes": [ { "note": "Export `marshaller` utility file.", @@ -9,6 +10,10 @@ { "note": "Add `getNodeTypeAsync` method", "pr": 812 + }, + { + "note": "Stop exporting uniqueVersionIds object", + "pr": 897 } ] }, diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 13e5d2bcd..d9c577ea9 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.7.3", + "version": "1.0.0", "engines": { "node": ">=6.12" }, @@ -45,8 +45,8 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/monorepo-scripts": "^0.2.2", - "@0xproject/tslint-config": "^0.4.21", + "@0xproject/monorepo-scripts": "^1.0.0", + "@0xproject/tslint-config": "^1.0.0", "@types/lodash": "4.14.104", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", @@ -64,11 +64,11 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "0.3.0", - "@0xproject/json-schemas": "^1.0.0", - "@0xproject/typescript-typings": "^0.4.3", - "@0xproject/utils": "^0.7.3", - "ethereum-types": "^0.0.2", + "@0xproject/assert": "^1.0.0", + "@0xproject/json-schemas": "^1.0.0-rc.1", + "@0xproject/typescript-typings": "^1.0.0", + "@0xproject/utils": "^1.0.0", + "ethereum-types": "^1.0.0", "ethereumjs-util": "^5.1.1", "ethers": "3.0.22", "lodash": "^4.17.4" diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 19fe0836c..4433b4b54 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,3 +1,3 @@ -export { Web3Wrapper, uniqueVersionIds, NodeType } from './web3_wrapper'; -export { Web3WrapperErrors } from './types'; +export { Web3Wrapper } from './web3_wrapper'; +export { Web3WrapperErrors, NodeType } from './types'; export { marshaller } from './marshaller'; diff --git a/packages/web3-wrapper/src/types.ts b/packages/web3-wrapper/src/types.ts index b7b6bd68a..e81039186 100644 --- a/packages/web3-wrapper/src/types.ts +++ b/packages/web3-wrapper/src/types.ts @@ -57,3 +57,9 @@ export interface TxDataRPC extends CallTxDataBaseRPC { 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/web3_wrapper.ts b/packages/web3-wrapper/src/web3_wrapper.ts index e828708f0..4439eb284 100644 --- a/packages/web3-wrapper/src/web3_wrapper.ts +++ b/packages/web3-wrapper/src/web3_wrapper.ts @@ -22,24 +22,18 @@ import { import * as _ from 'lodash'; import { marshaller } from './marshaller'; -import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, Web3WrapperErrors } from './types'; +import { BlockWithoutTransactionDataRPC, BlockWithTransactionDataRPC, NodeType, Web3WrapperErrors } from './types'; import { utils } from './utils'; const BASE_TEN = 10; // These are unique identifiers contained in the response of the // web3_clientVersion call. -export const uniqueVersionIds = { +const uniqueVersionIds = { geth: 'Geth', ganache: 'EthereumJS TestRPC', }; -// NodeType represents the type of the backing Ethereum node. -export enum NodeType { - Geth = 'GETH', - Ganache = 'GANACHE', -} - /** * An alternative to the Web3.js library that provides a consistent, clean, promise-based interface. */ |