From 249bf0163d8ee71b7329fd58b72e554c0324279c Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 3 Apr 2018 16:19:38 +0300 Subject: Move our contract templates to accept Provider instead of Web3Wrapper --- packages/deployer/CHANGELOG.json | 9 +++++++++ packages/deployer/src/deployer.ts | 8 ++++---- packages/deployer/src/utils/types.ts | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'packages/deployer') diff --git a/packages/deployer/CHANGELOG.json b/packages/deployer/CHANGELOG.json index 72f35a93d..d7e4cd05a 100644 --- a/packages/deployer/CHANGELOG.json +++ b/packages/deployer/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.4.0", + "changes": [ + { + "note": "Changed the config key from `web3Provider` to `provider` to be consistent with other tools", + "pr": 501 + } + ] + }, { "version": "0.3.5", "changes": [ diff --git a/packages/deployer/src/deployer.ts b/packages/deployer/src/deployer.ts index 7ee45fed5..84392997c 100644 --- a/packages/deployer/src/deployer.ts +++ b/packages/deployer/src/deployer.ts @@ -1,4 +1,4 @@ -import { AbiType, ConstructorAbi, ContractAbi, TxData } from '@0xproject/types'; +import { AbiType, ConstructorAbi, ContractAbi, Provider, TxData } from '@0xproject/types'; import { logUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; @@ -38,15 +38,15 @@ export class Deployer { this._artifactsDir = opts.artifactsDir; this._networkId = opts.networkId; this._defaults = opts.defaults; - let web3Provider: Web3.Provider; - if (_.isUndefined((opts as ProviderDeployerOptions).web3Provider)) { + let web3Provider: Provider; + if (_.isUndefined((opts as ProviderDeployerOptions).provider)) { const jsonrpcUrl = (opts as UrlDeployerOptions).jsonrpcUrl; if (_.isUndefined(jsonrpcUrl)) { throw new Error(`Deployer options don't contain web3Provider nor jsonrpcUrl. Please pass one of them`); } web3Provider = new Web3.providers.HttpProvider(jsonrpcUrl); } else { - web3Provider = (opts as ProviderDeployerOptions).web3Provider; + web3Provider = (opts as ProviderDeployerOptions).provider; } this.web3Wrapper = new Web3Wrapper(web3Provider, this._defaults); } diff --git a/packages/deployer/src/utils/types.ts b/packages/deployer/src/utils/types.ts index 7cb3958cb..7d131f5ce 100644 --- a/packages/deployer/src/utils/types.ts +++ b/packages/deployer/src/utils/types.ts @@ -1,4 +1,4 @@ -import { ContractAbi, TxData } from '@0xproject/types'; +import { ContractAbi, Provider, TxData } from '@0xproject/types'; import * as Web3 from 'web3'; import * as yargs from 'yargs'; @@ -65,7 +65,7 @@ export interface BaseDeployerOptions { } export interface ProviderDeployerOptions extends BaseDeployerOptions { - web3Provider: Web3.Provider; + provider: Provider; } export interface UrlDeployerOptions extends BaseDeployerOptions { -- cgit v1.2.3 From fbba5e054a158a933936922c8212d686595eccbd Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 5 Apr 2018 12:37:35 +0200 Subject: Address feedback --- packages/deployer/CHANGELOG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/deployer') diff --git a/packages/deployer/CHANGELOG.json b/packages/deployer/CHANGELOG.json index d7e4cd05a..f9691466b 100644 --- a/packages/deployer/CHANGELOG.json +++ b/packages/deployer/CHANGELOG.json @@ -3,7 +3,7 @@ "version": "0.4.0", "changes": [ { - "note": "Changed the config key from `web3Provider` to `provider` to be consistent with other tools", + "note": "Changed the config key `web3Provider` to `provider` to be consistent with other tools", "pr": 501 } ] -- cgit v1.2.3