Compare commits

..

2 Commits

Author SHA1 Message Date
Leonid Logvinov
2205e2b9a0 Publish
- 0x.js@0.32.0
 - @0xproject/abi-gen@0.1.7
 - @0xproject/assert@0.0.16
 - @0xproject/connect@0.5.5
 - contracts@2.1.9
 - @0xproject/deployer@0.0.6
 - @0xproject/dev-utils@0.0.10
 - @0xproject/json-schemas@0.7.8
 - @0xproject/monorepo-scripts@0.1.9
 - @0xproject/subproviders@0.3.6
 - @0xproject/testnet-faucets@1.0.10
 - @0xproject/tslint-config@0.4.7
 - @0xproject/types@0.1.9
 - @0xproject/utils@0.3.0
 - web3-typescript-typings@0.9.9
 - @0xproject/web3-wrapper@0.1.10
 - @0xproject/website@0.0.12
2018-02-05 22:29:42 +01:00
Leonid Logvinov
855fdd7921 Revert "Temp"
This reverts commit 881d32e733.
2018-02-05 22:26:50 +01:00
23 changed files with 77 additions and 155 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "0x.js",
"version": "0.31.1",
"version": "0.32.0",
"description": "A javascript library for interacting with the 0x protocol",
"keywords": [
"0x.js",
@@ -42,9 +42,9 @@
"node": ">=6.0.0"
},
"devDependencies": {
"@0xproject/abi-gen": "^0.1.6",
"@0xproject/dev-utils": "^0.0.9",
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/abi-gen": "^0.1.7",
"@0xproject/dev-utils": "^0.0.10",
"@0xproject/tslint-config": "^0.4.7",
"@types/bintrees": "^1.0.2",
"@types/jsonschema": "^1.1.1",
"@types/lodash": "^4.14.86",
@@ -76,15 +76,15 @@
"typedoc": "~0.8.0",
"typescript": "2.7.1",
"web3-provider-engine": "^13.0.1",
"web3-typescript-typings": "^0.9.8",
"web3-typescript-typings": "^0.9.9",
"webpack": "^3.1.0"
},
"dependencies": {
"@0xproject/assert": "^0.0.15",
"@0xproject/json-schemas": "^0.7.7",
"@0xproject/types": "^0.1.8",
"@0xproject/utils": "^0.2.4",
"@0xproject/web3-wrapper": "^0.1.9",
"@0xproject/assert": "^0.0.16",
"@0xproject/json-schemas": "^0.7.8",
"@0xproject/types": "^0.1.9",
"@0xproject/utils": "^0.3.0",
"@0xproject/web3-wrapper": "^0.1.10",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",

View File

@@ -196,7 +196,6 @@ export class ContractWrapper {
}
private async _reconcileBlockAsync(): Promise<void> {
const latestBlock = await this._web3Wrapper.getBlockAsync(BlockParamLiteral.Latest);
console.log('latestBlock', latestBlock.number);
// We need to coerce to Block type cause Web3.Block includes types for mempool blocks
if (!_.isUndefined(this._blockAndLogStreamerIfExists)) {
// If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/abi-gen",
"version": "0.1.6",
"version": "0.1.7",
"description": "Generate contract wrappers from ABI and handlebars templates",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/abi-gen/README.md",
"dependencies": {
"@0xproject/utils": "^0.2.4",
"@0xproject/utils": "^0.3.0",
"chalk": "^2.3.0",
"glob": "^7.1.2",
"handlebars": "^4.0.11",
@@ -34,7 +34,7 @@
"yargs": "^10.0.3"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"@types/glob": "^5.0.33",
"@types/handlebars": "^4.0.36",
"@types/mkdirp": "^0.5.1",
@@ -44,6 +44,6 @@
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/assert",
"version": "0.0.15",
"version": "0.0.16",
"description": "Provides a standard way of performing type and schema validation across 0x projects",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
"@types/valid-url": "^1.0.2",
@@ -38,8 +38,8 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/json-schemas": "^0.7.7",
"@0xproject/utils": "^0.2.4",
"@0xproject/json-schemas": "^0.7.8",
"@0xproject/utils": "^0.3.0",
"lodash": "^4.17.4",
"valid-url": "^1.0.9"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/connect",
"version": "0.5.4",
"version": "0.5.5",
"description": "A javascript library for interacting with the standard relayer api",
"keywords": [
"connect",
@@ -37,16 +37,16 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/connect/README.md",
"dependencies": {
"@0xproject/assert": "^0.0.15",
"@0xproject/json-schemas": "^0.7.7",
"@0xproject/utils": "^0.2.4",
"@0xproject/assert": "^0.0.16",
"@0xproject/json-schemas": "^0.7.8",
"@0xproject/utils": "^0.3.0",
"isomorphic-fetch": "^2.2.1",
"lodash": "^4.17.4",
"query-string": "^5.0.1",
"websocket": "^1.0.25"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"@types/fetch-mock": "^5.12.1",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
@@ -65,6 +65,6 @@
"tslint": "5.8.0",
"typedoc": "~0.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
}
}

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "contracts",
"version": "2.1.8",
"version": "2.1.9",
"description": "Smart contract components of 0x protocol",
"main": "index.js",
"directories": {
@@ -32,9 +32,9 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md",
"devDependencies": {
"@0xproject/dev-utils": "^0.0.9",
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/types": "^0.1.8",
"@0xproject/dev-utils": "^0.0.10",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/types": "^0.1.9",
"@types/bluebird": "^3.5.3",
"@types/lodash": "^4.14.86",
"@types/node": "^8.0.53",
@@ -54,15 +54,15 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8",
"web3-typescript-typings": "^0.9.9",
"yargs": "^10.0.3"
},
"dependencies": {
"0x.js": "^0.31.1",
"@0xproject/deployer": "^0.0.5",
"@0xproject/json-schemas": "^0.7.7",
"@0xproject/utils": "^0.2.4",
"@0xproject/web3-wrapper": "^0.1.9",
"0x.js": "^0.32.0",
"@0xproject/deployer": "^0.0.6",
"@0xproject/json-schemas": "^0.7.8",
"@0xproject/utils": "^0.3.0",
"@0xproject/web3-wrapper": "^0.1.10",
"bluebird": "^3.5.0",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/deployer",
"version": "0.0.5",
"version": "0.0.6",
"description": "Smart contract deployer of 0x protocol",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -31,11 +31,11 @@
"copyfiles": "^1.2.0",
"types-bn": "^0.0.1",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
},
"dependencies": {
"@0xproject/utils": "^0.2.4",
"@0xproject/web3-wrapper": "^0.1.9",
"@0xproject/utils": "^0.3.0",
"@0xproject/web3-wrapper": "^0.1.10",
"lodash": "^4.17.4",
"solc": "^0.4.18",
"web3": "^0.20.0",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/dev-utils",
"version": "0.0.9",
"version": "0.0.10",
"description": "0x dev TS utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,8 +20,8 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/dev-utils/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/types": "^0.1.8",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/types": "^0.1.9",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
@@ -31,7 +31,7 @@
"typescript": "2.7.1"
},
"dependencies": {
"@0xproject/utils": "^0.2.4",
"@0xproject/utils": "^0.3.0",
"ethereumjs-util": "^5.1.2",
"lodash": "^4.17.4",
"request-promise-native": "^1.0.5",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/json-schemas",
"version": "0.7.7",
"version": "0.7.8",
"description": "0x-related json schemas",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
@@ -28,8 +28,8 @@
"lodash.values": "^4.3.0"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/utils": "^0.2.4",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/utils": "^0.3.0",
"@types/lodash.foreach": "^4.5.3",
"@types/lodash.values": "^4.3.3",
"@types/mocha": "^2.2.42",

View File

@@ -1,10 +0,0 @@
FROM node
WORKDIR /src
COPY package.json .
RUN yarn install
COPY . .
CMD ["./lib/index.js"]

View File

@@ -1,25 +0,0 @@
{
"name": "long-lived-subscriptions-test",
"version": "0.0.1",
"description": "",
"scripts": {
"build:watch": "tsc -w",
"build": "tsc",
"start": "node lib/index.js",
"clean": "shx rm -rf lib",
"lint": "tslint --project . 'src/**/*.ts'"
},
"dependencies": {
"0x.js": "^0.31.1",
"lodash": "^4.17.4",
"web3": "^0.20.0"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@types/lodash": "^4.14.86",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
}
}

View File

@@ -1,32 +0,0 @@
import { DecodedLogEvent, ExchangeEvents, LogFillContractEventArgs, ZeroEx } from '0x.js';
import * as _ from 'lodash';
import * as Web3 from 'web3';
const zeroExConfig = {
networkId: 1,
};
const RPC_URL = 'https://mainnet.infura.io/T5WSC8cautR4KXyYgsRs';
// const RPC_URL = 'https://mainnet.0xproject.com';
const web3 = new Web3(new Web3.providers.HttpProvider(RPC_URL));
const zeroEx = new ZeroEx(web3.currentProvider, zeroExConfig);
const subscribe = () => {
console.log('subscribing...');
zeroEx.exchange.subscribe<LogFillContractEventArgs>(
ExchangeEvents.LogFill,
{},
(err: Error | null, event?: DecodedLogEvent<LogFillContractEventArgs>) => {
if (_.isNull(err)) {
console.log('EVENT');
console.log(event);
} else {
console.log('ERROR');
console.log(err);
subscribe();
}
},
);
};
subscribe();

View File

@@ -1,7 +0,0 @@
{
"extends": "../../tsconfig",
"compilerOptions": {
"outDir": "lib"
},
"include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"]
}

View File

@@ -1,3 +0,0 @@
{
"extends": ["@0xproject/tslint-config"]
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/monorepo-scripts",
"version": "0.1.8",
"version": "0.1.9",
"private": true,
"description": "Helper scripts for the monorepo",
"scripts": {
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/monorepo-scripts/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"@types/glob": "^5.0.33",
"@types/node": "^8.0.53",
"shx": "^0.2.2",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/subproviders",
"version": "0.3.5",
"version": "0.3.6",
"main": "lib/src/index.js",
"types": "lib/src/index.d.ts",
"license": "Apache-2.0",
@@ -18,8 +18,8 @@
"test:integration": "run-s clean build run_mocha_integration"
},
"dependencies": {
"@0xproject/assert": "^0.0.15",
"@0xproject/utils": "^0.2.4",
"@0xproject/assert": "^0.0.16",
"@0xproject/utils": "^0.3.0",
"bn.js": "^4.11.8",
"es6-promisify": "^5.0.0",
"ethereumjs-tx": "^1.3.3",
@@ -32,8 +32,8 @@
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/utils": "^0.2.4",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/utils": "^0.3.0",
"@types/lodash": "^4.14.86",
"@types/mocha": "^2.2.42",
"@types/node": "^8.0.53",
@@ -50,7 +50,7 @@
"types-bn": "^0.0.1",
"types-ethereumjs-util": "0xproject/types-ethereumjs-util",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8",
"web3-typescript-typings": "^0.9.9",
"webpack": "^3.1.0"
}
}

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "@0xproject/testnet-faucets",
"version": "1.0.9",
"version": "1.0.10",
"description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
"main": "server.js",
"scripts": {
@@ -15,8 +15,8 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.31.1",
"@0xproject/utils": "^0.2.4",
"0x.js": "^0.32.0",
"@0xproject/utils": "^0.3.0",
"body-parser": "^1.17.1",
"ethereumjs-tx": "^1.3.3",
"express": "^4.15.2",
@@ -26,7 +26,7 @@
"web3-provider-engine": "^13.0.1"
},
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"@types/body-parser": "^1.16.1",
"@types/express": "^4.0.35",
"@types/lodash": "^4.14.86",
@@ -37,7 +37,7 @@
"source-map-loader": "^0.1.6",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8",
"web3-typescript-typings": "^0.9.9",
"webpack": "^3.1.0",
"webpack-node-externals": "^1.6.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/tslint-config",
"version": "0.4.6",
"version": "0.4.7",
"description": "Lint rules related to 0xProject for TSLint",
"main": "tslint.json",
"scripts": {

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/types",
"version": "0.1.8",
"version": "0.1.9",
"description": "0x types",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,11 +20,11 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/types/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/tslint-config": "^0.4.7",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
},
"dependencies": {
"bignumber.js": "~4.1.0",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/utils",
"version": "0.2.4",
"version": "0.3.0",
"description": "0x TS utils",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,14 +20,14 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/utils/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/types": "^0.1.8",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/types": "^0.1.9",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
},
"dependencies": {
"bignumber.js": "~4.1.0",

View File

@@ -1,6 +1,6 @@
{
"name": "web3-typescript-typings",
"version": "0.9.8",
"version": "0.9.9",
"description": "Typescript type definitions for web3",
"main": "index.d.ts",
"types": "index.d.ts",

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/web3-wrapper",
"version": "0.1.9",
"version": "0.1.10",
"description": "Wraps around web3 and gives a nicer interface",
"main": "lib/index.js",
"types": "lib/index.d.ts",
@@ -20,17 +20,17 @@
},
"homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md",
"devDependencies": {
"@0xproject/tslint-config": "^0.4.6",
"@0xproject/types": "^0.1.8",
"@0xproject/tslint-config": "^0.4.7",
"@0xproject/types": "^0.1.9",
"@types/lodash": "^4.14.86",
"npm-run-all": "^4.1.2",
"shx": "^0.2.2",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8"
"web3-typescript-typings": "^0.9.9"
},
"dependencies": {
"@0xproject/utils": "^0.2.4",
"@0xproject/utils": "^0.3.0",
"lodash": "^4.17.4",
"web3": "^0.20.0"
}

View File

@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
"version": "0.0.11",
"version": "0.0.12",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -18,9 +18,9 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
"0x.js": "^0.31.1",
"@0xproject/subproviders": "^0.3.5",
"@0xproject/utils": "^0.2.4",
"0x.js": "^0.32.0",
"@0xproject/subproviders": "^0.3.6",
"@0xproject/utils": "^0.3.0",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -97,7 +97,7 @@
"style-loader": "0.13.x",
"tslint": "5.8.0",
"typescript": "2.7.1",
"web3-typescript-typings": "^0.9.8",
"web3-typescript-typings": "^0.9.9",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"