crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #359 from 0xProject/feature/ts-2.7

Browse Source 
TS 2.7
This commit is contained in:
Leonid 2018-02-05 11:24:36 +01:00 committed by GitHub
commit 03b1b12ef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/0x.js/package.json
View File

@ -71,7 +71,7 @@
"truffle-hdwallet-provider": "^0.0.3", "truffle-hdwallet-provider": "^0.0.3",
"tslint": "5.8.0", "tslint": "5.8.0",
"typedoc": "~0.8.0", "typedoc": "~0.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-provider-engine": "^13.0.1", "web3-provider-engine": "^13.0.1",
"web3-typescript-typings": "^0.9.7", "web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0" "webpack": "^3.1.0"

8
packages/0x.js/src/contract_wrappers/contract_wrapper.ts
View File

@ -34,8 +34,8 @@ export class ContractWrapper {
protected _web3Wrapper: Web3Wrapper; protected _web3Wrapper: Web3Wrapper;
private _networkId: number; private _networkId: number;
private _abiDecoder?: AbiDecoder; private _abiDecoder?: AbiDecoder;
private _blockAndLogStreamerIfExists: BlockAndLogStreamer | undefined; private _blockAndLogStreamerIfExists?: BlockAndLogStreamer;
private _blockAndLogStreamInterval: NodeJS.Timer; private _blockAndLogStreamIntervalIfExists?: NodeJS.Timer;
private _filters: { [filterToken: string]: Web3.FilterObject }; private _filters: { [filterToken: string]: Web3.FilterObject };
private _filterCallbacks: { private _filterCallbacks: {
[filterToken: string]: EventCallback<ContractEventArgs>; [filterToken: string]: EventCallback<ContractEventArgs>;
@ -162,7 +162,7 @@ export class ContractWrapper {
); );
const catchAllLogFilter = {}; const catchAllLogFilter = {};
this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter); this._blockAndLogStreamerIfExists.addLogFilter(catchAllLogFilter);
this._blockAndLogStreamInterval = intervalUtils.setAsyncExcludingInterval( this._blockAndLogStreamIntervalIfExists = intervalUtils.setAsyncExcludingInterval(
this._reconcileBlockAsync.bind(this), this._reconcileBlockAsync.bind(this),
constants.DEFAULT_BLOCK_POLLING_INTERVAL, constants.DEFAULT_BLOCK_POLLING_INTERVAL,
this._onReconcileBlockError.bind(this), this._onReconcileBlockError.bind(this),
@ -191,7 +191,7 @@ export class ContractWrapper {
} }
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string); this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string);
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string); this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string);
intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamInterval); intervalUtils.clearAsyncExcludingInterval(this._blockAndLogStreamIntervalIfExists as NodeJS.Timer);
delete this._blockAndLogStreamerIfExists; delete this._blockAndLogStreamerIfExists;
} }
private async _reconcileBlockAsync(): Promise<void> { private async _reconcileBlockAsync(): Promise<void> {

2
packages/abi-gen/package.json
View File

@ -43,7 +43,7 @@
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7" "web3-typescript-typings": "^0.9.7"
} }
} }

2
packages/assert/package.json
View File

@ -35,7 +35,7 @@
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"@0xproject/json-schemas": "^0.7.6", "@0xproject/json-schemas": "^0.7.6",

2
packages/connect/package.json
View File

@ -59,7 +59,7 @@
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typedoc": "~0.8.0", "typedoc": "~0.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7" "web3-typescript-typings": "^0.9.7"
} }
} }

2
packages/contracts/package.json
View File

@ -54,7 +54,7 @@
"tslint": "5.8.0", "tslint": "5.8.0",
"types-bn": "^0.0.1", "types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util", "types-ethereumjs-util": "0xproject/types-ethereumjs-util",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7", "web3-typescript-typings": "^0.9.7",
"yargs": "^10.0.3" "yargs": "^10.0.3"
}, },

2
packages/deployer/package.json
View File

@ -31,7 +31,7 @@
"copyfiles": "^1.2.0", "copyfiles": "^1.2.0",
"web3-typescript-typings": "^0.9.4", "web3-typescript-typings": "^0.9.4",
"types-bn": "^0.0.1", "types-bn": "^0.0.1",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7" "web3-typescript-typings": "^0.9.7"
}, },
"dependencies": { "dependencies": {

2
packages/dev-utils/package.json
View File

@ -28,7 +28,7 @@
"tslint": "5.8.0", "tslint": "5.8.0",
"types-bn": "^0.0.1", "types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util", "types-ethereumjs-util": "0xproject/types-ethereumjs-util",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"@0xproject/utils": "^0.2.3", "@0xproject/utils": "^0.2.3",

2
packages/json-schemas/package.json
View File

@ -41,6 +41,6 @@
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1" "typescript": "2.7.1"
} }
} }

2
packages/monorepo-scripts/package.json
View File

@ -25,7 +25,7 @@
"@types/node": "^8.0.53", "@types/node": "^8.0.53",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"chalk": "^2.3.0", "chalk": "^2.3.0",

2
packages/subproviders/package.json
View File

@ -49,7 +49,7 @@
"tslint": "5.8.0", "tslint": "5.8.0",
"types-bn": "^0.0.1", "types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util", "types-ethereumjs-util": "0xproject/types-ethereumjs-util",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.5", "web3-typescript-typings": "^0.9.5",
"webpack": "^3.1.0" "webpack": "^3.1.0"
} }

2
packages/testnet-faucets/package.json
View File

@ -36,7 +36,7 @@
"shx": "^0.2.2", "shx": "^0.2.2",
"source-map-loader": "^0.1.6", "source-map-loader": "^0.1.6",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7", "web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0", "webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0" "webpack-node-externals": "^1.6.0"

2
packages/tslint-config/package.json
View File

@ -29,7 +29,7 @@
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"tslint-eslint-rules": "^4.1.1", "tslint-eslint-rules": "^4.1.1",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"lodash": "^4.17.4", "lodash": "^4.17.4",

2
packages/types/package.json
View File

@ -24,7 +24,7 @@
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"web3-typescript-typings": "^0.9.5", "web3-typescript-typings": "^0.9.5",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"bignumber.js": "~4.1.0", "bignumber.js": "~4.1.0",

2
packages/utils/package.json
View File

@ -27,7 +27,7 @@
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"web3-typescript-typings": "^0.9.5", "web3-typescript-typings": "^0.9.5",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"bignumber.js": "~4.1.0", "bignumber.js": "~4.1.0",

2
packages/web3-typescript-typings/package.json
View File

@ -22,7 +22,7 @@
"@types/bignumber.js": "^4.0.2", "@types/bignumber.js": "^4.0.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2", "tslint-config-0xproject": "^0.0.2",
"typescript": "~2.6.1" "typescript": "2.7.1"
}, },
"dependencies": { "dependencies": {
"bignumber.js": "~4.1.0" "bignumber.js": "~4.1.0"

2
packages/web3-wrapper/package.json
View File

@ -26,7 +26,7 @@
"npm-run-all": "^4.1.2", "npm-run-all": "^4.1.2",
"shx": "^0.2.2", "shx": "^0.2.2",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7" "web3-typescript-typings": "^0.9.7"
}, },
"dependencies": { "dependencies": {

2
packages/website/package.json
View File

@ -99,7 +99,7 @@
"source-map-loader": "^0.1.6", "source-map-loader": "^0.1.6",
"style-loader": "0.13.x", "style-loader": "0.13.x",
"tslint": "5.8.0", "tslint": "5.8.0",
"typescript": "~2.6.1", "typescript": "2.7.1",
"web3-typescript-typings": "^0.9.7", "web3-typescript-typings": "^0.9.7",
"webpack": "^3.1.0", "webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0", "webpack-dev-middleware": "^1.10.0",

6
yarn.lock
View File

@ -9109,9 +9109,9 @@ typescript@2.4.1:
version "2.4.1" version "2.4.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
typescript@~2.6.1: typescript@2.7.1:
version "2.6.2" version "2.7.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.1.tgz#bb3682c2c791ac90e7c6210b26478a8da085c359"
ua-parser-js@^0.7.9: ua-parser-js@^0.7.9:
version "0.7.17" version "0.7.17"