aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Evans <jacob@dekz.net>2018-04-13 11:39:32 +0800
committerJacob Evans <jacob@dekz.net>2018-04-14 11:15:22 +0800
commit7b318b3cc20fa9185849db36429e307bbbf9d950 (patch)
tree8fdb2a657889a467e1db6fbfdeeb440731656adf
parent73e23996a64f2d0b7f6da855e2c918496e0348f6 (diff)
downloaddexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar.gz
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar.bz2
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar.lz
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar.xz
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.tar.zst
dexon-sol-tools-7b318b3cc20fa9185849db36429e307bbbf9d950.zip
Update the Changelog with pr number
-rw-r--r--packages/0x.js/CHANGELOG.json9
-rw-r--r--packages/dev-utils/CHANGELOG.json9
-rw-r--r--packages/dev-utils/src/web3_factory.ts2
3 files changed, 19 insertions, 1 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 9b5c52d00..a54550660 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "0.36.1",
+ "changes": [
+ {
+ "note": "Remove truffle-hdwallet from artifact tests",
+ "pr": 524
+ }
+ ],
+ },
+ {
"version": "0.36.0",
"changes": [
{
diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json
index b5dd3732d..8faf71d6a 100644
--- a/packages/dev-utils/CHANGELOG.json
+++ b/packages/dev-utils/CHANGELOG.json
@@ -1,5 +1,14 @@
[
{
+ "version": "0.3.6",
+ "changes": [
+ {
+ "note": "Allow an rpcURL to be set in Web3Config (for testnet RPC endpoints)",
+ "pr": 524
+ }
+ ]
+ },
+ {
"timestamp": 1523462196,
"version": "0.3.5",
"changes": [
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 5519bec2b..68348d671 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -54,7 +54,7 @@ export const web3Factory = {
};
const shouldUseInProcessGanache = !!config.shouldUseInProcessGanache;
if (shouldUseInProcessGanache) {
- if (_.isUndefined(config.rpcUrl)) {
+ if (!_.isUndefined(config.rpcUrl)) {
throw new Error('Cannot use both GanacheSubrovider and RPCSubprovider');
}
provider.addProvider(