From d20e81c449a717a79e1a78f83963cf64fbcddfd7 Mon Sep 17 00:00:00 2001 From: Hsuan Lee Date: Wed, 6 Mar 2019 14:50:42 +0800 Subject: Add type definitions to web3-provider-engine --- packages/sol-compiler/package.json | 1 - packages/sol-coverage/package.json | 4 +-- packages/sol-profiler/package.json | 4 +-- packages/sol-trace/package.json | 4 +-- packages/sol-tracing-utils/package.json | 4 +-- packages/subproviders/package.json | 8 ++--- packages/subproviders/src/globals.d.ts | 4 +-- packages/subproviders/src/index.ts | 2 +- .../subproviders/src/subproviders/nonce_tracker.ts | 2 +- .../subproviders/src/utils/subprovider_utils.ts | 2 +- .../test/unit/nonce_tracker_subprovider_test.ts | 2 +- .../types/web3-provider-engine/LICENSE | 21 ++++++++++++ .../types/web3-provider-engine/README.md | 16 +++++++++ .../types/web3-provider-engine/index.d.ts | 39 ++++++++++++++++++++++ .../types/web3-provider-engine/package.json | 24 +++++++++++++ 15 files changed, 118 insertions(+), 19 deletions(-) create mode 100644 packages/typescript-typings/types/web3-provider-engine/LICENSE create mode 100644 packages/typescript-typings/types/web3-provider-engine/README.md create mode 100644 packages/typescript-typings/types/web3-provider-engine/index.d.ts create mode 100644 packages/typescript-typings/types/web3-provider-engine/package.json (limited to 'packages') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index e33a8f044..b1674afba 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -71,7 +71,6 @@ "@0x/json-schemas": "^2.1.7", "@0x/sol-resolver": "^1.2.3", "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", "@dexon-foundation/dsolc": "^0.5.1", diff --git a/packages/sol-coverage/package.json b/packages/sol-coverage/package.json index f3ba70db9..88b46c2a8 100644 --- a/packages/sol-coverage/package.json +++ b/packages/sol-coverage/package.json @@ -29,9 +29,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-coverage/README.md", "dependencies": { - "@0x/typescript-typings": "^3.0.8", + "@dexon-foundation/typescript-typings": "^1.0.4", "@dexon-foundation/sol-tracing-utils": "^4.0.5", - "@dexon-foundation/subproviders": "^2.1.15", + "@dexon-foundation/subproviders": "^2.1.16", "ethereum-types": "^1.1.6", "lodash": "^4.17.5" }, diff --git a/packages/sol-profiler/package.json b/packages/sol-profiler/package.json index dc481e9c4..1efa5bb2e 100644 --- a/packages/sol-profiler/package.json +++ b/packages/sol-profiler/package.json @@ -29,9 +29,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-profiler/README.md", "dependencies": { - "@0x/typescript-typings": "^3.0.8", "@dexon-foundation/sol-tracing-utils": "^4.0.5", - "@dexon-foundation/subproviders": "^2.1.15", + "@dexon-foundation/subproviders": "^2.1.16", + "@dexon-foundation/typescript-typings": "^1.0.4", "ethereum-types": "^1.1.6", "lodash": "^4.17.5" }, diff --git a/packages/sol-trace/package.json b/packages/sol-trace/package.json index b0abde9a4..1337d5a6f 100644 --- a/packages/sol-trace/package.json +++ b/packages/sol-trace/package.json @@ -29,9 +29,9 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-trace/README.md", "dependencies": { - "@0x/typescript-typings": "^3.0.8", "@dexon-foundation/sol-tracing-utils": "^4.0.5", - "@dexon-foundation/subproviders": "^2.1.15", + "@dexon-foundation/subproviders": "^2.1.16", + "@dexon-foundation/typescript-typings": "^1.0.4", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", "lodash": "^4.17.5", diff --git a/packages/sol-tracing-utils/package.json b/packages/sol-tracing-utils/package.json index cdc53d661..5f1d44760 100644 --- a/packages/sol-tracing-utils/package.json +++ b/packages/sol-tracing-utils/package.json @@ -43,11 +43,11 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/sol-tracing-utils/README.md", "dependencies": { "@0x/dev-utils": "^1.0.24", - "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", "@dexon-foundation/sol-compiler": "^2.0.9", - "@dexon-foundation/subproviders": "^2.1.15", + "@dexon-foundation/subproviders": "^2.1.16", + "@dexon-foundation/typescript-typings": "^1.0.4", "@types/solidity-parser-antlr": "^0.2.0", "ethereum-types": "^1.1.6", "ethereumjs-util": "^5.1.1", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index c9766b3e1..95397053c 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -1,6 +1,6 @@ { "name": "@dexon-foundation/subproviders", - "version": "2.1.15", + "version": "2.1.16", "engines": { "node": ">=6.12" }, @@ -31,10 +31,11 @@ "dependencies": { "@0x/assert": "^1.0.23", "@0x/types": "^1.5.2", - "@0x/typescript-typings": "^3.0.8", "@0x/utils": "^3.0.1", "@0x/web3-wrapper": "^3.2.4", "@dexon-foundation/ganache-core": "^2.3.2", + "@dexon-foundation/typescript-typings": "^1.0.4", + "@dexon-foundation/web3-provider-engine": "^14.1.1", "@ledgerhq/hw-app-eth": "^4.3.0", "@ledgerhq/hw-transport-u2f": "4.24.0", "@types/eth-lightwallet": "^3.0.0", @@ -49,8 +50,7 @@ "hdkey": "^0.7.1", "json-rpc-error": "2.0.0", "lodash": "^4.17.5", - "semaphore-async-await": "^1.5.1", - "web3-provider-engine": "14.0.6" + "semaphore-async-await": "^1.5.1" }, "devDependencies": { "@0x/tslint-config": "^2.0.2", diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts index 3cbf84e37..d174c2912 100644 --- a/packages/subproviders/src/globals.d.ts +++ b/packages/subproviders/src/globals.d.ts @@ -4,13 +4,13 @@ declare module '*.json' { export default json; /* tslint:enable */ } -declare module 'web3-provider-engine/util/rpc-cache-utils' { +declare module '@dexon-foundation/web3-provider-engine/util/rpc-cache-utils' { class ProviderEngineRpcUtils { public static blockTagForPayload(payload: any): string | null; } export = ProviderEngineRpcUtils; } -declare module 'web3-provider-engine/subproviders/fixture' { +declare module '@dexon-foundation/web3-provider-engine/subproviders/fixture' { import { JSONRPCRequestPayload, JSONRPCResponsePayload } from 'ethereum-types'; class FixtureSubprovider { constructor(staticResponses: any); diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 050027f96..f438ea11a 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -1,6 +1,6 @@ import Eth from '@ledgerhq/hw-app-eth'; import TransportU2F from '@ledgerhq/hw-transport-u2f'; -export import Web3ProviderEngine = require('web3-provider-engine'); +export import Web3ProviderEngine = require('@dexon-foundation/web3-provider-engine'); import { LedgerEthereumClient } from './types'; diff --git a/packages/subproviders/src/subproviders/nonce_tracker.ts b/packages/subproviders/src/subproviders/nonce_tracker.ts index eea722aee..4e4013d23 100644 --- a/packages/subproviders/src/subproviders/nonce_tracker.ts +++ b/packages/subproviders/src/subproviders/nonce_tracker.ts @@ -3,7 +3,7 @@ import * as _ from 'lodash'; import { BlockParamLiteral, JSONRPCRequestPayload } from 'ethereum-types'; import EthereumTx = require('ethereumjs-tx'); import ethUtil = require('ethereumjs-util'); -import providerEngineUtils = require('web3-provider-engine/util/rpc-cache-utils'); +import providerEngineUtils = require('@dexon-foundation/web3-provider-engine/util/rpc-cache-utils'); import { Callback, ErrorCallback, NextCallback, NonceSubproviderErrors } from '../types'; diff --git a/packages/subproviders/src/utils/subprovider_utils.ts b/packages/subproviders/src/utils/subprovider_utils.ts index beda408ab..f63699de2 100644 --- a/packages/subproviders/src/utils/subprovider_utils.ts +++ b/packages/subproviders/src/utils/subprovider_utils.ts @@ -1,4 +1,4 @@ -import Web3ProviderEngine = require('web3-provider-engine'); +import Web3ProviderEngine = require('@dexon-foundation/web3-provider-engine'); import { Subprovider } from '../subproviders/subprovider'; diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts index a5cef30dc..e0fae763a 100644 --- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts +++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts @@ -1,5 +1,5 @@ import * as chai from 'chai'; -import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture'); +import FixtureSubprovider = require('@dexon-foundation/web3-provider-engine/subproviders/fixture'); import { promisify } from '@0x/utils'; import EthereumTx = require('ethereumjs-tx'); diff --git a/packages/typescript-typings/types/web3-provider-engine/LICENSE b/packages/typescript-typings/types/web3-provider-engine/LICENSE new file mode 100644 index 000000000..21071075c --- /dev/null +++ b/packages/typescript-typings/types/web3-provider-engine/LICENSE @@ -0,0 +1,21 @@ + MIT License + + Copyright (c) Microsoft Corporation. All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE diff --git a/packages/typescript-typings/types/web3-provider-engine/README.md b/packages/typescript-typings/types/web3-provider-engine/README.md new file mode 100644 index 000000000..c0f8fdd8b --- /dev/null +++ b/packages/typescript-typings/types/web3-provider-engine/README.md @@ -0,0 +1,16 @@ +# Installation +> `npm install --save @types/web3-provider-engine` + +# Summary +This package contains type definitions for web3-provider-engine (https://github.com/MetaMask/provider-engine#readme). + +# Details +Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/web3-provider-engine + +Additional Details + * Last updated: Mon, 30 Jul 2018 23:12:12 GMT + * Dependencies: ethereum-protocol + * Global values: none + +# Credits +These definitions were written by Leonid Logvinov . diff --git a/packages/typescript-typings/types/web3-provider-engine/index.d.ts b/packages/typescript-typings/types/web3-provider-engine/index.d.ts new file mode 100644 index 000000000..41130f38f --- /dev/null +++ b/packages/typescript-typings/types/web3-provider-engine/index.d.ts @@ -0,0 +1,39 @@ +// Type definitions for web3-provider-engine 14.0 +// Project: https://github.com/MetaMask/provider-engine#readme +// Definitions by: Leonid Logvinov +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.4 + +declare module '@dexon-foundation/web3-provider-engine' { + import { + Provider, + JSONRPCRequestPayload, + JSONRPCResponsePayload + } from "ethereum-protocol"; + interface Web3ProviderEngineOptions { + pollingInterval?: number; + blockTracker?: any; + blockTrackerProvider?: any; + } + declare class Web3ProviderEngine implements Provider { + constructor(options?: Web3ProviderEngineOptions); + on(event: string, handler: () => void): void; + send(payload: JSONRPCRequestPayload): void; + sendAsync( + payload: JSONRPCRequestPayload, + callback: ( + error: null | Error, + response: JSONRPCResponsePayload + ) => void + ): void; + addProvider(provider: any): void; + // start block polling + start(callback?: () => void): void; + // stop block polling + stop(): void; + } + export = Web3ProviderEngine; +} +// declare module "web3-provider-engine/subproviders/nonce-tracker"; +// declare module "web3-provider-engine/subproviders/hooked-wallet"; +// declare module "web3-provider-engine/subproviders/filters"; diff --git a/packages/typescript-typings/types/web3-provider-engine/package.json b/packages/typescript-typings/types/web3-provider-engine/package.json new file mode 100644 index 000000000..f2445a22c --- /dev/null +++ b/packages/typescript-typings/types/web3-provider-engine/package.json @@ -0,0 +1,24 @@ +{ + "name": "@types/web3-provider-engine", + "version": "14.0.0", + "description": "TypeScript definitions for web3-provider-engine", + "license": "MIT", + "contributors": [ + { + "name": "Leonid Logvinov", + "url": "https://github.com/LogvinovLeon", + "githubUsername": "LogvinovLeon" + } + ], + "main": "", + "repository": { + "type": "git", + "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git" + }, + "scripts": {}, + "dependencies": { + "@types/ethereum-protocol": "*" + }, + "typesPublisherContentHash": "aa787c969f42d99ef10c771552fe48a55c2b9ae57d92371eda77b74957500729", + "typeScriptVersion": "2.4" +} \ No newline at end of file -- cgit v1.2.3