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/src | |
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/src')
-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 |
3 files changed, 10 insertions, 10 deletions
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. */ |