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

Merge branch 'development' into feature/testnet-faucets/order-dispenser

Browse Source 
* development:
  Update utils in top level package to 0.3.0
  Add 0.2.0 back to yarn lock
  Reword comment on any
  Link to the wiki article in the README
  Justify the any usage
  Publish
  Revert "Temp"
  Changelog
  Change the InjectedWeb3Subprovider to accept Web3.Provider
This commit is contained in:
Brandon Millman
2018-02-06 11:45:55 -08:00
parent 83d0bad3a1 629653425d
commit 5fcb77e591
28 changed files with 92 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -16,7 +16,7 @@
"mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic"
},
"devDependencies": {
"@0xproject/utils": "^0.2.0",
"@0xproject/utils": "^0.3.0",
"async-child-process": "^1.1.1",
"ethereumjs-testrpc": "^6.0.3",
"lerna": "^2.5.1",

20
packages/0x.js/package.json
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",

1
packages/0x.js/src/contract_wrappers/contract_wrapper.ts
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

8
packages/abi-gen/package.json
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"
}
}

8
packages/assert/package.json
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"
}

12
packages/connect/package.json
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"
}
}

20
packages/contracts/package.json
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",

8
packages/deployer/package.json
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",

8
packages/dev-utils/package.json
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",

6
packages/json-schemas/package.json
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",

10
packages/long-lived-subscriptions-test/Dockerfile
View File

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

25
packages/long-lived-subscriptions-test/package.json
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"
}
}

32
packages/long-lived-subscriptions-test/src/index.ts
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();

7
packages/long-lived-subscriptions-test/tsconfig.json
View File

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

3
packages/long-lived-subscriptions-test/tslint.json
View File

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

4
packages/monorepo-scripts/package.json
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",

6
packages/subproviders/CHANGELOG.md
View File

@@ -1,6 +1,10 @@
# CHANGELOG
## v0.4.0 - _January 28, 2017_
## v0.4.0 - _Feburary 02, 2018_
* InjectedWeb3Subprovider accepts a Provider in the constructor, previously it was a Web3 object.
## v0.3.5 - _January 28, 2018_
* Return a transaction hash from `_sendTransactionAsync` (#303)

2
packages/subproviders/README.md
View File

@@ -2,6 +2,8 @@
A few useful web3 subproviders including a LedgerSubprovider useful for adding Ledger Nano S support.
We have written up a [Wiki](https://0xproject.com/wiki#Web3-Provider-Examples) article detailing some use cases of this subprovider package.
## Installation
```

12
packages/subproviders/package.json
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"
}
}

11
packages/subproviders/src/subproviders/injected_web3.ts
View File

@@ -1,17 +1,16 @@
import * as _ from 'lodash';
import Web3 = require('web3');
import Web3ProviderEngine = require('web3-provider-engine');
/*
* This class implements the web3-provider-engine subprovider interface and forwards
* requests involving user accounts (getAccounts, sendTransaction, etc...) to the injected
* web3 instance in their browser.
* provider instance in their browser.
* Source: https://github.com/MetaMask/provider-engine/blob/master/subproviders/subprovider.js
*/
export class InjectedWeb3Subprovider {
private _injectedWeb3: Web3;
constructor(injectedWeb3: Web3) {
this._injectedWeb3 = injectedWeb3;
constructor(subprovider: Web3.Provider) {
this._injectedWeb3 = new Web3(subprovider);
}
public handleRequest(
payload: Web3.JSONRPCRequestPayload,
@@ -42,8 +41,10 @@ export class InjectedWeb3Subprovider {
}
}
// Required to implement this method despite not needing it for this subprovider
// The engine argument type should be Web3ProviderEngine, but we've decided to keep it as type any
// to remove the provider engine depdency given this method is a noop
// tslint:disable-next-line:prefer-function-over-method
public setEngine(engine: Web3ProviderEngine) {
public setEngine(engine: any) {
// noop
}
}

10
packages/testnet-faucets/package.json
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",
"ethereumjs-util": "^5.1.1",
@@ -27,7 +27,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",
@@ -39,7 +39,7 @@
"tslint": "5.8.0",
"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",
"webpack-node-externals": "^1.6.0"
}

2
packages/tslint-config/package.json
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": {

6
packages/types/package.json
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",

8
packages/utils/package.json
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",

2
packages/web3-typescript-typings/package.json
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",

10
packages/web3-wrapper/package.json
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"
}

10
packages/website/package.json
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"

2
packages/website/ts/blockchain.ts
View File

@@ -100,7 +100,7 @@ export class Blockchain {
// We catch all requests involving a users account and send it to the injectedWeb3
// instance. All other requests go to the public hosted node.
provider = new ProviderEngine();
provider.addProvider(new InjectedWeb3Subprovider(injectedWeb3));
provider.addProvider(new InjectedWeb3Subprovider(injectedWeb3.currentProvider));
provider.addProvider(new FilterSubprovider());
provider.addProvider(new RedundantRPCSubprovider(publicNodeUrlsIfExistsForNetworkId));
provider.start();