From 9f924e459c43c023e35ab7222cd9824cc0e67411 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 18 Oct 2018 21:51:56 +1100 Subject: chore: change package org from 0xproject to 0x --- packages/subproviders/package.json | 14 +++++++------- packages/subproviders/src/index.ts | 2 +- .../src/subproviders/base_wallet_subprovider.ts | 4 ++-- .../src/subproviders/eth_lightwallet_subprovider.ts | 2 +- packages/subproviders/src/subproviders/ledger.ts | 4 ++-- .../subproviders/src/subproviders/metamask_subprovider.ts | 2 +- packages/subproviders/src/subproviders/mnemonic_wallet.ts | 6 +++--- .../subproviders/src/subproviders/private_key_wallet.ts | 6 +++--- .../subproviders/src/subproviders/redundant_subprovider.ts | 2 +- packages/subproviders/src/subproviders/rpc_subprovider.ts | 6 +++--- packages/subproviders/src/subproviders/signer.ts | 2 +- packages/subproviders/src/subproviders/subprovider.ts | 2 +- packages/subproviders/src/types.ts | 2 +- .../test/integration/ledger_subprovider_test.ts | 4 ++-- .../test/unit/nonce_tracker_subprovider_test.ts | 2 +- .../test/unit/redundant_rpc_subprovider_test.ts | 2 +- packages/subproviders/test/utils/report_callback_errors.ts | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 1fe1ee4ad..e88c0c239 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,5 +1,5 @@ { - "name": "@0xproject/subproviders", + "name": "@0x/subproviders", "version": "2.0.7", "engines": { "node": ">=6.12" @@ -29,11 +29,11 @@ } }, "dependencies": { - "@0xproject/assert": "^1.0.13", - "@0xproject/types": "^1.1.4", - "@0xproject/typescript-typings": "^3.0.2", - "@0xproject/utils": "^2.0.2", - "@0xproject/web3-wrapper": "^3.0.3", + "@0x/assert": "^1.0.13", + "@0x/types": "^1.1.4", + "@0x/typescript-typings": "^3.0.2", + "@0x/utils": "^2.0.2", + "@0x/web3-wrapper": "^3.0.3", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", "@types/eth-lightwallet": "^3.0.0", @@ -54,7 +54,7 @@ "web3-provider-engine": "14.0.6" }, "devDependencies": { - "@0xproject/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.8", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", "@types/ethereumjs-tx": "^1.0.0", diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 9f4dac58b..8f02210c9 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -55,7 +55,7 @@ export { EIP712TypedData, EIP712Types, EIP712Parameter, -} from '@0xproject/types'; +} from '@0x/types'; export { JSONRPCRequestPayload, diff --git a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts index 409a0d330..e9d104074 100644 --- a/packages/subproviders/src/subproviders/base_wallet_subprovider.ts +++ b/packages/subproviders/src/subproviders/base_wallet_subprovider.ts @@ -1,5 +1,5 @@ -import { assert } from '@0xproject/assert'; -import { addressUtils } from '@0xproject/utils'; +import { assert } from '@0x/assert'; +import { addressUtils } from '@0x/utils'; import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts index a1d93ac49..15cd713af 100644 --- a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts +++ b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts @@ -1,4 +1,4 @@ -import { EIP712TypedData } from '@0xproject/types'; +import { EIP712TypedData } from '@0x/types'; import * as lightwallet from 'eth-lightwallet'; import { PartialTxParams } from '../types'; diff --git a/packages/subproviders/src/subproviders/ledger.ts b/packages/subproviders/src/subproviders/ledger.ts index ee8edde92..28e348f90 100644 --- a/packages/subproviders/src/subproviders/ledger.ts +++ b/packages/subproviders/src/subproviders/ledger.ts @@ -1,5 +1,5 @@ -import { assert } from '@0xproject/assert'; -import { addressUtils } from '@0xproject/utils'; +import { assert } from '@0x/assert'; +import { addressUtils } from '@0x/utils'; import EthereumTx = require('ethereumjs-tx'); import ethUtil = require('ethereumjs-util'); import HDNode = require('hdkey'); diff --git a/packages/subproviders/src/subproviders/metamask_subprovider.ts b/packages/subproviders/src/subproviders/metamask_subprovider.ts index 46fc2a9cd..ba207d4cc 100644 --- a/packages/subproviders/src/subproviders/metamask_subprovider.ts +++ b/packages/subproviders/src/subproviders/metamask_subprovider.ts @@ -1,4 +1,4 @@ -import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import * as ethUtil from 'ethereumjs-util'; diff --git a/packages/subproviders/src/subproviders/mnemonic_wallet.ts b/packages/subproviders/src/subproviders/mnemonic_wallet.ts index 04a11c7be..140e3d515 100644 --- a/packages/subproviders/src/subproviders/mnemonic_wallet.ts +++ b/packages/subproviders/src/subproviders/mnemonic_wallet.ts @@ -1,6 +1,6 @@ -import { assert } from '@0xproject/assert'; -import { EIP712TypedData } from '@0xproject/types'; -import { addressUtils } from '@0xproject/utils'; +import { assert } from '@0x/assert'; +import { EIP712TypedData } from '@0x/types'; +import { addressUtils } from '@0x/utils'; import * as bip39 from 'bip39'; import HDNode = require('hdkey'); import * as _ from 'lodash'; diff --git a/packages/subproviders/src/subproviders/private_key_wallet.ts b/packages/subproviders/src/subproviders/private_key_wallet.ts index e89c4c186..dca7e6810 100644 --- a/packages/subproviders/src/subproviders/private_key_wallet.ts +++ b/packages/subproviders/src/subproviders/private_key_wallet.ts @@ -1,6 +1,6 @@ -import { assert } from '@0xproject/assert'; -import { EIP712TypedData } from '@0xproject/types'; -import { signTypedDataUtils } from '@0xproject/utils'; +import { assert } from '@0x/assert'; +import { EIP712TypedData } from '@0x/types'; +import { signTypedDataUtils } from '@0x/utils'; import EthereumTx = require('ethereumjs-tx'); import * as ethUtil from 'ethereumjs-util'; import * as _ from 'lodash'; diff --git a/packages/subproviders/src/subproviders/redundant_subprovider.ts b/packages/subproviders/src/subproviders/redundant_subprovider.ts index 59a2986f8..58312f203 100644 --- a/packages/subproviders/src/subproviders/redundant_subprovider.ts +++ b/packages/subproviders/src/subproviders/redundant_subprovider.ts @@ -1,4 +1,4 @@ -import { promisify } from '@0xproject/utils'; +import { promisify } from '@0x/utils'; import { JSONRPCRequestPayload } from 'ethereum-types'; import * as _ from 'lodash'; diff --git a/packages/subproviders/src/subproviders/rpc_subprovider.ts b/packages/subproviders/src/subproviders/rpc_subprovider.ts index 18d6da307..437518e12 100644 --- a/packages/subproviders/src/subproviders/rpc_subprovider.ts +++ b/packages/subproviders/src/subproviders/rpc_subprovider.ts @@ -1,6 +1,6 @@ -import { assert } from '@0xproject/assert'; -import { StatusCodes } from '@0xproject/types'; -import { fetchAsync } from '@0xproject/utils'; +import { assert } from '@0x/assert'; +import { StatusCodes } from '@0x/types'; +import { fetchAsync } from '@0x/utils'; import { JSONRPCRequestPayload } from 'ethereum-types'; import JsonRpcError = require('json-rpc-error'); diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index eda7db42e..9bd5cbdf1 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,4 +1,4 @@ -import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { marshaller, Web3Wrapper } from '@0x/web3-wrapper'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; diff --git a/packages/subproviders/src/subproviders/subprovider.ts b/packages/subproviders/src/subproviders/subprovider.ts index dcf880c79..cd6780e0c 100644 --- a/packages/subproviders/src/subproviders/subprovider.ts +++ b/packages/subproviders/src/subproviders/subprovider.ts @@ -1,4 +1,4 @@ -import { promisify } from '@0xproject/utils'; +import { promisify } from '@0x/utils'; import { JSONRPCRequestPayload, JSONRPCResponsePayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback, JSONRPCRequestPayloadWithMethod } from '../types'; diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts index e8a47ad34..ed3aea176 100644 --- a/packages/subproviders/src/types.ts +++ b/packages/subproviders/src/types.ts @@ -1,4 +1,4 @@ -import { ECSignature } from '@0xproject/types'; +import { ECSignature } from '@0x/types'; import { JSONRPCRequestPayload } from 'ethereum-types'; import HDNode = require('hdkey'); diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts index 527ee5b22..b072e611b 100644 --- a/packages/subproviders/test/integration/ledger_subprovider_test.ts +++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts @@ -1,5 +1,5 @@ -import { DoneCallback } from '@0xproject/types'; -import { promisify } from '@0xproject/utils'; +import { DoneCallback } from '@0x/types'; +import { promisify } from '@0x/utils'; import Eth from '@ledgerhq/hw-app-eth'; // HACK: This dependency is optional and tslint skips optional dependencies // tslint:disable-next-line:no-implicit-dependencies diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts index 05f213cf5..a5cef30dc 100644 --- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts +++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts @@ -1,7 +1,7 @@ import * as chai from 'chai'; import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture'); -import { promisify } from '@0xproject/utils'; +import { promisify } from '@0x/utils'; import EthereumTx = require('ethereumjs-tx'); import { NonceTrackerSubprovider, Web3ProviderEngine } from '../../src'; diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts index e30d2f74e..fb4e43f9e 100644 --- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts +++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts @@ -1,4 +1,4 @@ -import { DoneCallback } from '@0xproject/types'; +import { DoneCallback } from '@0x/types'; import * as chai from 'chai'; import { JSONRPCResponsePayload } from 'ethereum-types'; import * as Sinon from 'sinon'; diff --git a/packages/subproviders/test/utils/report_callback_errors.ts b/packages/subproviders/test/utils/report_callback_errors.ts index eaefea7c3..6eb7420c3 100644 --- a/packages/subproviders/test/utils/report_callback_errors.ts +++ b/packages/subproviders/test/utils/report_callback_errors.ts @@ -1,4 +1,4 @@ -import { DoneCallback } from '@0xproject/types'; +import { DoneCallback } from '@0x/types'; export const reportCallbackErrors = (done: DoneCallback) => { return (f: (...args: any[]) => void) => { -- cgit v1.2.3 From 88c929a408d17d8d1f4604187f8b1b04e94dab73 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 18 Oct 2018 22:01:04 +1100 Subject: chore: change tslint.json from 0xproject to 0x --- packages/subproviders/tslint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/tslint.json b/packages/subproviders/tslint.json index ffaefe83a..dd9053357 100644 --- a/packages/subproviders/tslint.json +++ b/packages/subproviders/tslint.json @@ -1,3 +1,3 @@ { - "extends": ["@0xproject/tslint-config"] + "extends": ["@0x/tslint-config"] } -- cgit v1.2.3 From 2735fb4fa6901dc528aea5f642512c161b842efd Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 18 Oct 2018 22:03:47 +1100 Subject: chore: change README.md from 0xproject to 0x --- packages/subproviders/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md index 90c9b7bbe..6f97d760e 100644 --- a/packages/subproviders/README.md +++ b/packages/subproviders/README.md @@ -1,4 +1,4 @@ -## @0xproject/subproviders +## @0x/subproviders A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support. @@ -9,14 +9,14 @@ We have written up a [Wiki](https://0xproject.com/wiki#Web3-Provider-Examples) a ## Installation ``` -yarn add @0xproject/subproviders +yarn add @0x/subproviders ``` If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`: ```json "compilerOptions": { - "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"], + "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"], } ``` @@ -45,13 +45,13 @@ yarn install To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory: ```bash -PKG=@0xproject/subproviders yarn build +PKG=@0x/subproviders yarn build ``` Or continuously rebuild on change: ```bash -PKG=@0xproject/subproviders yarn watch +PKG=@0x/subproviders yarn watch ``` ### Clean -- cgit v1.2.3 From ece76e58748f235c73a662b748ccb695ac20c1e0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Oct 2018 15:27:07 +0200 Subject: Fix prettier issues --- packages/subproviders/src/index.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 8f02210c9..050027f96 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -48,14 +48,7 @@ export { LedgerGetAddressResult, } from './types'; -export { - ECSignature, - EIP712Object, - EIP712ObjectValue, - EIP712TypedData, - EIP712Types, - EIP712Parameter, -} from '@0x/types'; +export { ECSignature, EIP712Object, EIP712ObjectValue, EIP712TypedData, EIP712Types, EIP712Parameter } from '@0x/types'; export { JSONRPCRequestPayload, -- cgit v1.2.3 From 7e49db23010ed5a20b100e08802be08c2dadda2b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Oct 2018 15:52:32 +0200 Subject: Fix ethereum-types versions --- packages/subproviders/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index e88c0c239..272c740b9 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -43,7 +43,7 @@ "bip39": "^2.5.0", "bn.js": "^4.11.8", "eth-lightwallet": "^3.0.1", - "ethereum-types": "^1.0.11", + "ethereum-types": "^1.1.0", "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "ganache-core": "^2.2.1", -- cgit v1.2.3 From 71d1e6b0ecb4bfb5cfa44cf35b924682383beba2 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Oct 2018 16:02:49 +0200 Subject: Updated CHANGELOGS --- packages/subproviders/CHANGELOG.json | 3 ++- packages/subproviders/CHANGELOG.md | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 6aeeeb333..b145bbbe5 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -14,7 +14,8 @@ "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library", "pr": 1105 } - ] + ], + "timestamp": 1539871071 }, { "version": "2.0.7", diff --git a/packages/subproviders/CHANGELOG.md b/packages/subproviders/CHANGELOG.md index 872948ad7..f9e3e63a6 100644 --- a/packages/subproviders/CHANGELOG.md +++ b/packages/subproviders/CHANGELOG.md @@ -5,6 +5,12 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v2.1.0 - _October 18, 2018_ + + * Add `MetamaskSubprovider` to handle inconsistent JSON RPC behaviour (#1102) + * Add support for `eth_signTypedData` in wallets Mnemonic, Private and EthLightWallet (#1102) + * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105) + ## v2.0.7 - _October 4, 2018_ * Dependencies updated @@ -37,7 +43,7 @@ CHANGELOG * Export types: `PartialTxParams`, `JSONRPCRequestPayloadWithMethod`, `ECSignatureString`, `AccountFetchingConfigs`, `LedgerEthereumClientFactoryAsync`, `OnNextCompleted`, `MnemonicWalletSubproviderConfigs`, LedgerGetAddressResult, `JSONRPCRequestPayload`, `Provider`, `JSONRPCResponsePayload` and `JSONRPCErrorCallback` (#924) -## v1.0.5 - _August 13, 2018_ +## v1.0.5 - _August 14, 2018_ * Dependencies updated -- cgit v1.2.3 From 8b62b350b1fed6a0d8827ca9ed5fcec3e78ae82f Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Oct 2018 16:03:00 +0200 Subject: Publish - 0x.js@2.0.0 - @0x/abi-gen@1.0.14 - @0x/abi-gen-wrappers@1.0.1 - @0x/assert@1.0.14 - @0x/asset-buyer@2.1.0 - @0x/base-contract@3.0.2 - @0x/connect@3.0.2 - @0x/contract-addresses@1.0.1 - @0x/contract-artifacts@1.0.1 - @0x/contract-wrappers@3.0.0 - contracts@2.1.50 - @0x/dev-tools-pages@0.0.2 - @0x/dev-utils@1.0.13 - ethereum-types@1.1.1 - @0x/fill-scenarios@1.0.8 - @0x/instant@0.0.3 - @0x/json-schemas@2.0.0 - @0x/metacoin@0.0.24 - @0x/migrations@2.0.0 - @0x/monorepo-scripts@1.0.12 - @0x/order-utils@2.0.0 - @0x/order-watcher@2.2.0 - @0x/react-docs@1.0.14 - @0x/react-shared@1.0.17 - @0x/sol-compiler@1.1.8 - @0x/sol-cov@2.1.8 - @0x/sol-doc@1.0.3 - @0x/sol-resolver@1.0.15 - @0x/sra-spec@1.0.7 - @0x/subproviders@2.1.0 - @0x/testnet-faucets@1.0.52 - @0x/tslint-config@1.0.9 - @0x/types@1.2.0 - @0x/typescript-typings@3.0.3 - @0x/utils@2.0.3 - @0x/web3-wrapper@3.1.0 - @0x/website@0.0.55 --- packages/subproviders/package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'packages/subproviders') diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 272c740b9..4eef09fe6 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@0x/subproviders", - "version": "2.0.7", + "version": "2.1.0", "engines": { "node": ">=6.12" }, @@ -29,11 +29,11 @@ } }, "dependencies": { - "@0x/assert": "^1.0.13", - "@0x/types": "^1.1.4", - "@0x/typescript-typings": "^3.0.2", - "@0x/utils": "^2.0.2", - "@0x/web3-wrapper": "^3.0.3", + "@0x/assert": "^1.0.14", + "@0x/types": "^1.2.0", + "@0x/typescript-typings": "^3.0.3", + "@0x/utils": "^2.0.3", + "@0x/web3-wrapper": "^3.1.0", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "^4.3.0", "@types/eth-lightwallet": "^3.0.0", @@ -43,7 +43,7 @@ "bip39": "^2.5.0", "bn.js": "^4.11.8", "eth-lightwallet": "^3.0.1", - "ethereum-types": "^1.1.0", + "ethereum-types": "^1.1.1", "ethereumjs-tx": "^1.3.5", "ethereumjs-util": "^5.1.1", "ganache-core": "^2.2.1", @@ -54,7 +54,7 @@ "web3-provider-engine": "14.0.6" }, "devDependencies": { - "@0x/tslint-config": "^1.0.8", + "@0x/tslint-config": "^1.0.9", "@types/bip39": "^2.4.0", "@types/bn.js": "^4.11.0", "@types/ethereumjs-tx": "^1.0.0", -- cgit v1.2.3