From a6f97181310c9acba176b2a28ffba1ca7d53727d Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 8 Dec 2017 13:17:03 -0800 Subject: Publish - 0x.js@0.27.2 - abi-gen-templates@0.0.2 - @0xproject/abi-gen@0.0.2 - @0xproject/assert@0.0.7 - @0xproject/connect@0.3.0 - contracts@2.0.0 - @0xproject/json-schemas@0.6.10 - @0xproject/monorepo-scripts@0.1.0 - @0xproject/subproviders@0.1.0 - @0xproject/tslint-config@0.2.1 - @0xproject/types@0.1.0 - @0xproject/utils@0.1.0 - @0xproject/web3-wrapper@0.1.0 - website@0.0.2 --- packages/web3-wrapper/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 4eea7ed31..3ac532f55 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.0.1", + "version": "0.1.0", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.2.0", - "@0xproject/types": "^0.0.1", + "@0xproject/tslint-config": "^0.2.1", + "@0xproject/types": "^0.1.0", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -29,7 +29,7 @@ "web3-typescript-typings": "^0.7.2" }, "dependencies": { - "@0xproject/utils": "^0.0.1", + "@0xproject/utils": "^0.1.0", "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "web3": "^0.20.0" -- cgit v1.2.3 From 9c6453e12969bb3564e3146e66806476d7cd7b21 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Fri, 8 Dec 2017 14:56:56 -0800 Subject: Fix broken postpublish_utils, add CHANGELOG and postpublish.js scripts to all packages --- packages/web3-wrapper/CHANGELOG.md | 4 ++++ packages/web3-wrapper/scripts/postpublish.js | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packages/web3-wrapper/CHANGELOG.md create mode 100644 packages/web3-wrapper/scripts/postpublish.js (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md new file mode 100644 index 000000000..b4cce6be0 --- /dev/null +++ b/packages/web3-wrapper/CHANGELOG.md @@ -0,0 +1,4 @@ +# CHANGELOG + +vx.x.x +------------------------ diff --git a/packages/web3-wrapper/scripts/postpublish.js b/packages/web3-wrapper/scripts/postpublish.js new file mode 100644 index 000000000..7fa452b08 --- /dev/null +++ b/packages/web3-wrapper/scripts/postpublish.js @@ -0,0 +1,14 @@ +const postpublish_utils = require('../../../scripts/postpublish_utils'); +const packageJSON = require('../package.json'); + +const subPackageName = packageJSON.name; + +postpublish_utils.getLatestTagAndVersionAsync(subPackageName) + .then(function(result) { + const releaseName = postpublish_utils.getReleaseName(subPackageName, result.version); + const assets = []; + return postpublish_utils.publishReleaseNotes(result.tag, releaseName, assets); + }) + .catch (function(err) { + throw err; + }); -- cgit v1.2.3 From de6fe257518e661b35df080ab54b1adc6819af5b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 19 Dec 2017 16:53:41 +0100 Subject: Write 4 README's --- packages/web3-wrapper/README.md | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index 0df8c6333..04f2b8ca0 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -3,8 +3,38 @@ Web3 wrapper Wrapped version of web3 with nicer interface to be used across 0x projects and packages -## Install +## Installation ```bash yarn add @0xproject/web3-wrapper ``` + +## Usage + +TODO - Custom documentation page is in progress. + +## Contributing + +We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. + +[CONTRIBUTING.md](../../CONTRIBUTING.md) + +## Install Dependencies + +If you don't have yarn workspaces enabled - enable them: +`yarn config set workspaces-experimental true` + +Then install dependencies +`yarn install` + +## Build + +`yarn build` + +## Lint + +`yarn lint` + +## Run Tests + +`yarn test` -- cgit v1.2.3 From ecc6cb2b7c8aff181341474830cd482579db7ca1 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 19 Dec 2017 18:03:44 +0100 Subject: Address feedback --- packages/web3-wrapper/README.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index 04f2b8ca0..db879d3cf 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -19,22 +19,32 @@ We strongly encourage our community members to help us make improvements and to [CONTRIBUTING.md](../../CONTRIBUTING.md) -## Install Dependencies +### Install Dependencies If you don't have yarn workspaces enabled - enable them: -`yarn config set workspaces-experimental true` +```bash +yarn config set workspaces-experimental true +``` Then install dependencies -`yarn install` +```bash +yarn install +``` -## Build +### Build -`yarn build` +```bash +yarn build +``` -## Lint +### Lint -`yarn lint` +```bash +yarn lint +``` -## Run Tests +### Run Tests -`yarn test` +```bash +yarn test +``` -- cgit v1.2.3 From 3579f063d6fb09f7a091d3f896bd29edb84b3f55 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 19 Dec 2017 18:04:42 +0100 Subject: Fix the headers --- packages/web3-wrapper/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index db879d3cf..c8a984435 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -1,4 +1,4 @@ -Web3 wrapper +@0xproject/web3-wrapper ------ Wrapped version of web3 with nicer interface to be used across 0x projects and packages -- cgit v1.2.3 From c3508dcdc6e2cf459bf076c0bb0087338cf96f7a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Dec 2017 14:10:35 +0100 Subject: Change CONTRIBUTING section --- packages/web3-wrapper/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index c8a984435..3624cea8c 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -17,7 +17,7 @@ TODO - Custom documentation page is in progress. We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. -[CONTRIBUTING.md](../../CONTRIBUTING.md) +Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. ### Install Dependencies -- cgit v1.2.3 From 8ed776e113f0e249d50aa9e74b459b770ff62cee Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Dec 2017 14:17:17 +0100 Subject: Fix yarn workspaces explanation --- packages/web3-wrapper/README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index 3624cea8c..2aac1124b 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -1,7 +1,7 @@ @0xproject/web3-wrapper ------ -Wrapped version of web3 with nicer interface to be used across 0x projects and packages +Wrapped version of web3 with a nicer interface that is used across 0x projects and packages ## Installation @@ -11,7 +11,13 @@ yarn add @0xproject/web3-wrapper ## Usage -TODO - Custom documentation page is in progress. +```typescript +import {Web3Wrapper} from '@0xproject/web3-wrapper'; + +const web3 = ...; +const web3Wrapper = new Web3Wrapper(web3.currentProvider); +const availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); +``` ## Contributing @@ -21,7 +27,7 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting ### Install Dependencies -If you don't have yarn workspaces enabled - enable them: +If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: ```bash yarn config set workspaces-experimental true ``` -- cgit v1.2.3 From bf1603839ee5b7e8a1b1db32a0d037b3680a38d6 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Dec 2017 14:21:39 +0100 Subject: Change contributing test --- packages/web3-wrapper/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index 2aac1124b..c6e2163a3 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -21,7 +21,7 @@ const availableAddresses = await web3Wrapper.getAvailableAddressesAsync(); ## Contributing -We strongly encourage our community members to help us make improvements and to determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. +We strongly encourage that the community help us make improvements and determine the future direction of the protocol. To report bugs within this package, please create an issue in this repository. Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting started. -- cgit v1.2.3 From cb11aec84df346d5180c7d5874859c1c34f0bf1c Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 20 Dec 2017 00:44:08 -0500 Subject: Add new underscore-privates rule to @0xproject/tslint-config and fix lint errors --- packages/web3-wrapper/src/index.ts | 78 +++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 7df24e9a5..dd94d683e 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -16,9 +16,9 @@ interface RawLogEntry { } export class Web3Wrapper { - private web3: Web3; - private defaults: Partial; - private jsonRpcRequestId: number; + private _web3: Web3; + private _defaults: Partial; + private _jsonRpcRequestId: number; constructor(provider: Web3.Provider, defaults?: Partial) { if (_.isUndefined((provider as any).sendAsync)) { // Web3@1.0 provider doesn't support synchronous http requests, @@ -26,69 +26,69 @@ export class Web3Wrapper { // We re-assign the send method so that Web3@1.0 providers work with 0x.js (provider as any).sendAsync = (provider as any).send; } - this.web3 = new Web3(); - this.web3.setProvider(provider); - this.defaults = defaults || {}; - this.jsonRpcRequestId = 0; + this._web3 = new Web3(); + this._web3.setProvider(provider); + this._defaults = defaults || {}; + this._jsonRpcRequestId = 0; } public getContractDefaults(): Partial { - return this.defaults; + return this._defaults; } public setProvider(provider: Web3.Provider, networkId: number) { - this.web3.setProvider(provider); + this._web3.setProvider(provider); } public isAddress(address: string): boolean { - return this.web3.isAddress(address); + return this._web3.isAddress(address); } public async isSenderAddressAvailableAsync(senderAddress: string): Promise { const addresses = await this.getAvailableAddressesAsync(); return _.includes(addresses, senderAddress); } public async getNodeVersionAsync(): Promise { - const nodeVersion = await promisify(this.web3.version.getNode)(); + const nodeVersion = await promisify(this._web3.version.getNode)(); return nodeVersion; } public async getNetworkIdAsync(): Promise { - const networkIdStr = await promisify(this.web3.version.getNetwork)(); + const networkIdStr = await promisify(this._web3.version.getNetwork)(); const networkId = _.parseInt(networkIdStr); return networkId; } public async getTransactionReceiptAsync(txHash: string): Promise { - const transactionReceipt = await promisify(this.web3.eth.getTransactionReceipt)(txHash); + const transactionReceipt = await promisify(this._web3.eth.getTransactionReceipt)(txHash); if (!_.isNull(transactionReceipt)) { - transactionReceipt.status = this.normalizeTxReceiptStatus(transactionReceipt.status); + transactionReceipt.status = this._normalizeTxReceiptStatus(transactionReceipt.status); } return transactionReceipt; } public getCurrentProvider(): Web3.Provider { - return this.web3.currentProvider; + return this._web3.currentProvider; } public toWei(ethAmount: BigNumber): BigNumber { - const balanceWei = this.web3.toWei(ethAmount, 'ether'); + const balanceWei = this._web3.toWei(ethAmount, 'ether'); return balanceWei; } public async getBalanceInWeiAsync(owner: string): Promise { - let balanceInWei = await promisify(this.web3.eth.getBalance)(owner); + let balanceInWei = await promisify(this._web3.eth.getBalance)(owner); // Rewrap in a new BigNumber balanceInWei = new BigNumber(balanceInWei); return balanceInWei; } public async doesContractExistAtAddressAsync(address: string): Promise { - const code = await promisify(this.web3.eth.getCode)(address); + const code = await promisify(this._web3.eth.getCode)(address); // Regex matches 0x0, 0x00, 0x in order to accommodate poorly implemented clients const codeIsEmpty = /^0x0{0,40}$/i.test(code); return !codeIsEmpty; } public async signTransactionAsync(address: string, message: string): Promise { - const signData = await promisify(this.web3.eth.sign)(address, message); + const signData = await promisify(this._web3.eth.sign)(address, message); return signData; } public async getBlockNumberAsync(): Promise { - const blockNumber = await promisify(this.web3.eth.getBlockNumber)(); + const blockNumber = await promisify(this._web3.eth.getBlockNumber)(); return blockNumber; } public async getBlockAsync(blockParam: string|Web3.BlockParam): Promise { - const block = await promisify(this.web3.eth.getBlock)(blockParam); + const block = await promisify(this._web3.eth.getBlock)(blockParam); return block; } public async getBlockTimestampAsync(blockParam: string|Web3.BlockParam): Promise { @@ -96,17 +96,17 @@ export class Web3Wrapper { return timestamp; } public async getAvailableAddressesAsync(): Promise { - const addresses = await promisify(this.web3.eth.getAccounts)(); + const addresses = await promisify(this._web3.eth.getAccounts)(); return addresses; } public async getLogsAsync(filter: Web3.FilterObject): Promise { let fromBlock = filter.fromBlock; if (_.isNumber(fromBlock)) { - fromBlock = this.web3.toHex(fromBlock); + fromBlock = this._web3.toHex(fromBlock); } let toBlock = filter.toBlock; if (_.isNumber(toBlock)) { - toBlock = this.web3.toHex(toBlock); + toBlock = this._web3.toHex(toBlock); } const serializedFilter = { ...filter, @@ -115,16 +115,16 @@ export class Web3Wrapper { }; const payload = { jsonrpc: '2.0', - id: this.jsonRpcRequestId++, + id: this._jsonRpcRequestId++, method: 'eth_getLogs', params: [serializedFilter], }; - const rawLogs = await this.sendRawPayloadAsync(payload); - const formattedLogs = _.map(rawLogs, this.formatLog.bind(this)); + const rawLogs = await this._sendRawPayloadAsync(payload); + const formattedLogs = _.map(rawLogs, this._formatLog.bind(this)); return formattedLogs; } public getContractFromAbi(abi: Web3.ContractAbi): Web3.Contract { - const web3Contract = this.web3.eth.contract(abi); + const web3Contract = this._web3.eth.contract(abi); return web3Contract; } public getContractInstance(abi: Web3.ContractAbi, address: string): Web3.ContractInstance { @@ -132,43 +132,43 @@ export class Web3Wrapper { return web3ContractInstance; } public async estimateGasAsync(data: string): Promise { - const gas = await promisify(this.web3.eth.estimateGas)({data}); + const gas = await promisify(this._web3.eth.estimateGas)({data}); return gas; } - private async sendRawPayloadAsync(payload: Web3.JSONRPCRequestPayload): Promise { - const sendAsync = this.web3.currentProvider.sendAsync.bind(this.web3.currentProvider); + private async _sendRawPayloadAsync(payload: Web3.JSONRPCRequestPayload): Promise { + const sendAsync = this._web3.currentProvider.sendAsync.bind(this._web3.currentProvider); const response = await promisify(sendAsync)(payload); const result = response.result; return result; } - private normalizeTxReceiptStatus(status: undefined|null|string|0|1): null|0|1 { + private _normalizeTxReceiptStatus(status: undefined|null|string|0|1): null|0|1 { // Transaction status might have four values // undefined - Testrpc and other old clients // null - New clients on old transactions // number - Parity // hex - Geth if (_.isString(status)) { - return this.web3.toDecimal(status) as 0|1; + return this._web3.toDecimal(status) as 0|1; } else if (_.isUndefined(status)) { return null; } else { return status; } } - private formatLog(rawLog: RawLogEntry): Web3.LogEntry { + private _formatLog(rawLog: RawLogEntry): Web3.LogEntry { const formattedLog = { ...rawLog, - logIndex: this.hexToDecimal(rawLog.logIndex), - blockNumber: this.hexToDecimal(rawLog.blockNumber), - transactionIndex: this.hexToDecimal(rawLog.transactionIndex), + logIndex: this._hexToDecimal(rawLog.logIndex), + blockNumber: this._hexToDecimal(rawLog.blockNumber), + transactionIndex: this._hexToDecimal(rawLog.transactionIndex), }; return formattedLog; } - private hexToDecimal(hex: string|null): number|null { + private _hexToDecimal(hex: string|null): number|null { if (_.isNull(hex)) { return null; } - const decimal = this.web3.toDecimal(hex); + const decimal = this._web3.toDecimal(hex); return decimal; } } -- cgit v1.2.3 From a2bf19efc1d1aef67ac6da321fe36c53135c6555 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 20 Dec 2017 17:10:12 +0100 Subject: Publish - 0x.js@0.28.0 - @0xproject/abi-gen@0.0.3 - @0xproject/assert@0.0.8 - @0xproject/connect@0.3.1 - contracts@2.1.0 - @0xproject/dev-utils@0.0.2 - @0xproject/json-schemas@0.7.0 - @0xproject/kovan_faucets@1.0.1 - @0xproject/monorepo-scripts@0.1.1 - @0xproject/subproviders@0.1.1 - @0xproject/tslint-config@0.3.0 - @0xproject/types@0.1.1 - @0xproject/utils@0.1.1 - @0xproject/web3-wrapper@0.1.1 - @0xproject/website@0.0.3 --- packages/web3-wrapper/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 3ac532f55..2df0c08f4 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.0", + "version": "0.1.1", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.2.1", - "@0xproject/types": "^0.1.0", + "@0xproject/tslint-config": "^0.3.0", + "@0xproject/types": "^0.1.1", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -29,7 +29,7 @@ "web3-typescript-typings": "^0.7.2" }, "dependencies": { - "@0xproject/utils": "^0.1.0", + "@0xproject/utils": "^0.1.1", "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "web3": "^0.20.0" -- cgit v1.2.3 From 12dc8c0d158517b77ac548e0f102a45068f2f5e3 Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Thu, 21 Dec 2017 14:44:09 -0500 Subject: Add missing calls to bigNumberConfigs in packages where we are instantiating BigNumbers --- packages/web3-wrapper/src/index.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index dd94d683e..b48532204 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,5 +1,8 @@ import {TransactionReceipt, TxData} from '@0xproject/types'; -import {promisify} from '@0xproject/utils'; +import { + bigNumberConfigs, + promisify, +} from '@0xproject/utils'; import BigNumber from 'bignumber.js'; import * as _ from 'lodash'; import * as Web3 from 'web3'; @@ -15,6 +18,9 @@ interface RawLogEntry { topics: string[]; } +// Customize our BigNumber instances +bigNumberConfigs.configure(); + export class Web3Wrapper { private _web3: Web3; private _defaults: Partial; -- cgit v1.2.3 From f684cc371104b594358fb8cd274e453c81f48881 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Thu, 28 Dec 2017 10:57:04 +0100 Subject: Publish - 0x.js@0.29.0 - @0xproject/abi-gen@0.0.4 - @0xproject/assert@0.0.9 - @0xproject/connect@0.3.2 - contracts@2.1.1 - @0xproject/dev-utils@0.0.3 - @0xproject/json-schemas@0.7.1 - @0xproject/kovan_faucets@1.0.2 - @0xproject/monorepo-scripts@0.1.2 - @0xproject/subproviders@0.2.0 - @0xproject/tslint-config@0.4.0 - @0xproject/types@0.1.2 - @0xproject/utils@0.1.2 - @0xproject/web3-wrapper@0.1.2 - @0xproject/website@0.0.4 --- packages/web3-wrapper/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 2df0c08f4..6cc642c9d 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.1", + "version": "0.1.2", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,8 +19,8 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.3.0", - "@0xproject/types": "^0.1.1", + "@0xproject/tslint-config": "^0.4.0", + "@0xproject/types": "^0.1.2", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", @@ -29,7 +29,7 @@ "web3-typescript-typings": "^0.7.2" }, "dependencies": { - "@0xproject/utils": "^0.1.1", + "@0xproject/utils": "^0.1.2", "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "web3": "^0.20.0" -- cgit v1.2.3 From e744e4cd989bd3ae1070c59f7baa8097f18b8b06 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 22 Dec 2017 15:05:32 +0100 Subject: Apply prettier config --- packages/web3-wrapper/src/index.ts | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index b48532204..b7dd042f2 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,18 +1,15 @@ -import {TransactionReceipt, TxData} from '@0xproject/types'; -import { - bigNumberConfigs, - promisify, -} from '@0xproject/utils'; +import { TransactionReceipt, TxData } from '@0xproject/types'; +import { bigNumberConfigs, promisify } from '@0xproject/utils'; import BigNumber from 'bignumber.js'; import * as _ from 'lodash'; import * as Web3 from 'web3'; interface RawLogEntry { - logIndex: string|null; - transactionIndex: string|null; + logIndex: string | null; + transactionIndex: string | null; transactionHash: string; - blockHash: string|null; - blockNumber: string|null; + blockHash: string | null; + blockNumber: string | null; address: string; data: string; topics: string[]; @@ -93,12 +90,12 @@ export class Web3Wrapper { const blockNumber = await promisify(this._web3.eth.getBlockNumber)(); return blockNumber; } - public async getBlockAsync(blockParam: string|Web3.BlockParam): Promise { + public async getBlockAsync(blockParam: string | Web3.BlockParam): Promise { const block = await promisify(this._web3.eth.getBlock)(blockParam); return block; } - public async getBlockTimestampAsync(blockParam: string|Web3.BlockParam): Promise { - const {timestamp} = await this.getBlockAsync(blockParam); + public async getBlockTimestampAsync(blockParam: string | Web3.BlockParam): Promise { + const { timestamp } = await this.getBlockAsync(blockParam); return timestamp; } public async getAvailableAddressesAsync(): Promise { @@ -138,7 +135,7 @@ export class Web3Wrapper { return web3ContractInstance; } public async estimateGasAsync(data: string): Promise { - const gas = await promisify(this._web3.eth.estimateGas)({data}); + const gas = await promisify(this._web3.eth.estimateGas)({ data }); return gas; } private async _sendRawPayloadAsync(payload: Web3.JSONRPCRequestPayload): Promise { @@ -147,14 +144,14 @@ export class Web3Wrapper { const result = response.result; return result; } - private _normalizeTxReceiptStatus(status: undefined|null|string|0|1): null|0|1 { + private _normalizeTxReceiptStatus(status: undefined | null | string | 0 | 1): null | 0 | 1 { // Transaction status might have four values // undefined - Testrpc and other old clients // null - New clients on old transactions // number - Parity // hex - Geth if (_.isString(status)) { - return this._web3.toDecimal(status) as 0|1; + return this._web3.toDecimal(status) as 0 | 1; } else if (_.isUndefined(status)) { return null; } else { @@ -170,7 +167,7 @@ export class Web3Wrapper { }; return formattedLog; } - private _hexToDecimal(hex: string|null): number|null { + private _hexToDecimal(hex: string | null): number | null { if (_.isNull(hex)) { return null; } -- cgit v1.2.3 From 4dfa720f2dec2be0b0758633c087579a02e482bb Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 4 Jan 2018 12:38:19 +0100 Subject: Use configured version of bignumber in all packages --- packages/web3-wrapper/package.json | 1 - packages/web3-wrapper/src/index.ts | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 6cc642c9d..053712b12 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -30,7 +30,6 @@ }, "dependencies": { "@0xproject/utils": "^0.1.2", - "bignumber.js": "~4.1.0", "lodash": "^4.17.4", "web3": "^0.20.0" } diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index b7dd042f2..8fa38e987 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -1,6 +1,5 @@ import { TransactionReceipt, TxData } from '@0xproject/types'; -import { bigNumberConfigs, promisify } from '@0xproject/utils'; -import BigNumber from 'bignumber.js'; +import { BigNumber, promisify } from '@0xproject/utils'; import * as _ from 'lodash'; import * as Web3 from 'web3'; @@ -15,9 +14,6 @@ interface RawLogEntry { topics: string[]; } -// Customize our BigNumber instances -bigNumberConfigs.configure(); - export class Web3Wrapper { private _web3: Web3; private _defaults: Partial; -- cgit v1.2.3 From c700046b7673a0f470c8d8abeec3cf873049a78a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 4 Jan 2018 12:54:16 +0100 Subject: Apply prettify on json and md files --- packages/web3-wrapper/CHANGELOG.md | 3 +- packages/web3-wrapper/README.md | 5 +-- packages/web3-wrapper/package.json | 68 ++++++++++++++++++------------------- packages/web3-wrapper/tsconfig.json | 25 ++++++-------- packages/web3-wrapper/tslint.json | 4 +-- 5 files changed, 50 insertions(+), 55 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/CHANGELOG.md b/packages/web3-wrapper/CHANGELOG.md index b4cce6be0..899482c4c 100644 --- a/packages/web3-wrapper/CHANGELOG.md +++ b/packages/web3-wrapper/CHANGELOG.md @@ -1,4 +1,3 @@ # CHANGELOG -vx.x.x ------------------------- +## vx.x.x diff --git a/packages/web3-wrapper/README.md b/packages/web3-wrapper/README.md index c6e2163a3..5b22aefd4 100644 --- a/packages/web3-wrapper/README.md +++ b/packages/web3-wrapper/README.md @@ -1,5 +1,4 @@ -@0xproject/web3-wrapper ------- +## @0xproject/web3-wrapper Wrapped version of web3 with a nicer interface that is used across 0x projects and packages @@ -28,11 +27,13 @@ Please read our [contribution guidelines](../../CONTRIBUTING.md) before getting ### Install Dependencies If you don't have yarn workspaces enabled (Yarn < v1.0) - enable them: + ```bash yarn config set workspaces-experimental true ``` Then install dependencies + ```bash yarn install ``` diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 053712b12..e7269d277 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,36 +1,36 @@ { - "name": "@0xproject/web3-wrapper", - "version": "0.1.2", - "description": "Wraps around web3 and gives a nicer interface", - "main": "lib/index.js", - "types": "lib/index.d.ts", - "scripts": { - "build": "tsc", - "clean": "shx rm -rf lib", - "lint": "tslint --project . 'src/**/*.ts'" - }, - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "https://github.com/0xProject/0x.js.git" - }, - "bugs": { - "url": "https://github.com/0xProject/0x.js/issues" - }, - "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", - "devDependencies": { - "@0xproject/tslint-config": "^0.4.0", - "@0xproject/types": "^0.1.2", - "@types/lodash": "^4.14.86", - "npm-run-all": "^4.1.2", - "shx": "^0.2.2", - "tslint": "5.8.0", - "typescript": "~2.6.1", - "web3-typescript-typings": "^0.7.2" - }, - "dependencies": { - "@0xproject/utils": "^0.1.2", - "lodash": "^4.17.4", - "web3": "^0.20.0" - } + "name": "@0xproject/web3-wrapper", + "version": "0.1.2", + "description": "Wraps around web3 and gives a nicer interface", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "scripts": { + "build": "tsc", + "clean": "shx rm -rf lib", + "lint": "tslint --project . 'src/**/*.ts'" + }, + "license": "Apache-2.0", + "repository": { + "type": "git", + "url": "https://github.com/0xProject/0x.js.git" + }, + "bugs": { + "url": "https://github.com/0xProject/0x.js/issues" + }, + "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", + "devDependencies": { + "@0xproject/tslint-config": "^0.4.0", + "@0xproject/types": "^0.1.2", + "@types/lodash": "^4.14.86", + "npm-run-all": "^4.1.2", + "shx": "^0.2.2", + "tslint": "5.8.0", + "typescript": "~2.6.1", + "web3-typescript-typings": "^0.7.2" + }, + "dependencies": { + "@0xproject/utils": "^0.1.2", + "lodash": "^4.17.4", + "web3": "^0.20.0" + } } diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json index de186cfc4..0aa8c3dde 100644 --- a/packages/web3-wrapper/tsconfig.json +++ b/packages/web3-wrapper/tsconfig.json @@ -1,16 +1,13 @@ { - "compilerOptions": { - "module": "commonjs", - "target": "es5", - "lib": [ "es2017", "dom"], - "outDir": "lib", - "sourceMap": true, - "declaration": true, - "noImplicitAny": true, - "strictNullChecks": true - }, - "include": [ - "./src/**/*", - "../../node_modules/web3-typescript-typings/index.d.ts" - ] + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "lib": ["es2017", "dom"], + "outDir": "lib", + "sourceMap": true, + "declaration": true, + "noImplicitAny": true, + "strictNullChecks": true + }, + "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } diff --git a/packages/web3-wrapper/tslint.json b/packages/web3-wrapper/tslint.json index a07795151..ffaefe83a 100644 --- a/packages/web3-wrapper/tslint.json +++ b/packages/web3-wrapper/tslint.json @@ -1,5 +1,3 @@ { - "extends": [ - "@0xproject/tslint-config" - ] + "extends": ["@0xproject/tslint-config"] } -- cgit v1.2.3 From 27d9fba785a5a53550be53b12baf9069bda8d160 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 4 Jan 2018 18:56:30 +0100 Subject: Include web3 types via typeRoots and factor out common parts of tsconfig.json --- packages/web3-wrapper/package.json | 2 +- packages/web3-wrapper/src/index.ts | 2 +- packages/web3-wrapper/tsconfig.json | 12 +++--------- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index e7269d277..13e32e991 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -26,7 +26,7 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.7.2" + "web3-typescript-typings": "^0.9.0" }, "dependencies": { "@0xproject/utils": "^0.1.2", diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts index 8fa38e987..c4826f2be 100644 --- a/packages/web3-wrapper/src/index.ts +++ b/packages/web3-wrapper/src/index.ts @@ -33,7 +33,7 @@ export class Web3Wrapper { public getContractDefaults(): Partial { return this._defaults; } - public setProvider(provider: Web3.Provider, networkId: number) { + public setProvider(provider: Web3.Provider) { this._web3.setProvider(provider); } public isAddress(address: string): boolean { diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json index 0aa8c3dde..c56d255d5 100644 --- a/packages/web3-wrapper/tsconfig.json +++ b/packages/web3-wrapper/tsconfig.json @@ -1,13 +1,7 @@ { + "extends": "../../tsconfig", "compilerOptions": { - "module": "commonjs", - "target": "es5", - "lib": ["es2017", "dom"], - "outDir": "lib", - "sourceMap": true, - "declaration": true, - "noImplicitAny": true, - "strictNullChecks": true + "outDir": "lib" }, - "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] + "include": ["./src/**/*"] } -- cgit v1.2.3 From 78fd942faa752980caba6e37edd2932b1235cfd7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 5 Jan 2018 13:32:01 +0100 Subject: Return to old way of including web3 types --- packages/web3-wrapper/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/tsconfig.json b/packages/web3-wrapper/tsconfig.json index c56d255d5..3d967d05f 100644 --- a/packages/web3-wrapper/tsconfig.json +++ b/packages/web3-wrapper/tsconfig.json @@ -3,5 +3,5 @@ "compilerOptions": { "outDir": "lib" }, - "include": ["./src/**/*"] + "include": ["./src/**/*", "../../node_modules/web3-typescript-typings/index.d.ts"] } -- cgit v1.2.3 From 31b3ac4b98dc9fc5f2588a2dc4664de1dea5f49c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 11 Jan 2018 13:05:49 +0100 Subject: Publish - 0x.js@0.29.1 - @0xproject/abi-gen@0.1.0 - @0xproject/assert@0.0.10 - @0xproject/connect@0.4.0 - contracts@2.1.2 - @0xproject/dev-utils@0.0.4 - @0xproject/json-schemas@0.7.2 - @0xproject/kovan_faucets@1.0.3 - @0xproject/monorepo-scripts@0.1.3 - @0xproject/subproviders@0.3.0 - @0xproject/tslint-config@0.4.1 - @0xproject/types@0.1.3 - @0xproject/utils@0.1.3 - web3-typescript-typings@0.9.1 - @0xproject/web3-wrapper@0.1.3 - @0xproject/website@0.0.5 --- packages/web3-wrapper/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 13e32e991..0b780aea0 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.2", + "version": "0.1.3", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.0", - "@0xproject/types": "^0.1.2", + "@0xproject/tslint-config": "^0.4.1", + "@0xproject/types": "^0.1.3", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.0" + "web3-typescript-typings": "^0.9.1" }, "dependencies": { - "@0xproject/utils": "^0.1.2", + "@0xproject/utils": "^0.1.3", "lodash": "^4.17.4", "web3": "^0.20.0" } -- cgit v1.2.3 From 2bba1ae292ed9756f86bc5b172f5cf52f3780d87 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 11 Jan 2018 14:43:58 +0100 Subject: Publish - 0x.js@0.29.2 - @0xproject/abi-gen@0.1.1 - @0xproject/connect@0.4.1 - contracts@2.1.3 - @0xproject/kovan_faucets@1.0.4 - web3-typescript-typings@0.9.3 - @0xproject/web3-wrapper@0.1.4 - @0xproject/website@0.0.6 --- packages/web3-wrapper/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 0b780aea0..8c20f3f2e 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.3", + "version": "0.1.4", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -26,7 +26,7 @@ "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.1" + "web3-typescript-typings": "^0.9.3" }, "dependencies": { "@0xproject/utils": "^0.1.3", -- cgit v1.2.3 From d58bfb46cf50131d361ad0cbd08ef44454f8930e Mon Sep 17 00:00:00 2001 From: Brandon Millman Date: Wed, 17 Jan 2018 22:45:09 -0800 Subject: Publish - 0x.js@0.30.0 - @0xproject/abi-gen@0.1.2 - @0xproject/assert@0.0.11 - chai-as-promised-typescript-typings@0.0.4 - chai-typescript-typings@0.0.2 - @0xproject/connect@0.5.0 - contracts@2.1.4 - @0xproject/dev-utils@0.0.5 - @0xproject/json-schemas@0.7.3 - @0xproject/kovan_faucets@1.0.5 - @0xproject/monorepo-scripts@0.1.4 - @0xproject/subproviders@0.3.1 - @0xproject/tslint-config@0.4.2 - @0xproject/types@0.1.4 - @0xproject/utils@0.2.0 - web3-typescript-typings@0.9.4 - @0xproject/web3-wrapper@0.1.5 - @0xproject/website@0.0.7 --- packages/web3-wrapper/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index 8c20f3f2e..f2802bfbf 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.4", + "version": "0.1.5", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.1", - "@0xproject/types": "^0.1.3", + "@0xproject/tslint-config": "^0.4.2", + "@0xproject/types": "^0.1.4", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.3" + "web3-typescript-typings": "^0.9.4" }, "dependencies": { - "@0xproject/utils": "^0.1.3", + "@0xproject/utils": "^0.2.0", "lodash": "^4.17.4", "web3": "^0.20.0" } -- cgit v1.2.3 From f58f0ddb67555c3f0c7252ea3e003824984c48ad Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 24 Jan 2018 17:02:13 +0100 Subject: Publish - 0x.js@0.30.1 - @0xproject/abi-gen@0.1.3 - @0xproject/assert@0.0.12 - chai-as-promised-typescript-typings@0.0.5 - @0xproject/connect@0.5.1 - contracts@2.1.5 - @0xproject/deployer@0.0.2 - @0xproject/dev-utils@0.0.6 - @0xproject/json-schemas@0.7.4 - @0xproject/kovan_faucets@1.0.6 - @0xproject/monorepo-scripts@0.1.5 - @0xproject/subproviders@0.3.2 - @0xproject/tslint-config@0.4.3 - @0xproject/types@0.1.5 - @0xproject/utils@0.2.1 - web3-typescript-typings@0.9.5 - @0xproject/web3-wrapper@0.1.6 - @0xproject/website@0.0.8 --- packages/web3-wrapper/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages/web3-wrapper') diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index f2802bfbf..a0e15b48d 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/web3-wrapper", - "version": "0.1.5", + "version": "0.1.6", "description": "Wraps around web3 and gives a nicer interface", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -19,17 +19,17 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/web3-wrapper/README.md", "devDependencies": { - "@0xproject/tslint-config": "^0.4.2", - "@0xproject/types": "^0.1.4", + "@0xproject/tslint-config": "^0.4.3", + "@0xproject/types": "^0.1.5", "@types/lodash": "^4.14.86", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "~2.6.1", - "web3-typescript-typings": "^0.9.4" + "web3-typescript-typings": "^0.9.5" }, "dependencies": { - "@0xproject/utils": "^0.2.0", + "@0xproject/utils": "^0.2.1", "lodash": "^4.17.4", "web3": "^0.20.0" } -- cgit v1.2.3