aboutsummaryrefslogtreecommitdiffstats
path: root/packages/ethereum-types
diff options
context:
space:
mode:
authorSteve Klebanoff <steve.klebanoff@gmail.com>2019-01-16 02:43:55 +0800
committerSteve Klebanoff <steve.klebanoff@gmail.com>2019-01-16 02:43:55 +0800
commit600b44c9620494c976b5aac6e8a1912543cda81c (patch)
treefd78c65dd2fdd7b1cbee1b5eff97a95a984a9186 /packages/ethereum-types
parent8a8a5332d76ae8429d1c6449e0ea693a2e8c8a8a (diff)
parentf570f80674c22f69712c45e8e3c48e948b51f357 (diff)
downloaddexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar.gz
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar.bz2
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar.lz
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar.xz
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.tar.zst
dexon-sol-tools-600b44c9620494c976b5aac6e8a1912543cda81c.zip
Merge branch 'development' into feature/instant/asset-buyer-check-liquidity
Diffstat (limited to 'packages/ethereum-types')
-rw-r--r--packages/ethereum-types/CHANGELOG.json18
-rw-r--r--packages/ethereum-types/CHANGELOG.md8
-rw-r--r--packages/ethereum-types/package.json4
-rw-r--r--packages/ethereum-types/src/index.ts2
4 files changed, 30 insertions, 2 deletions
diff --git a/packages/ethereum-types/CHANGELOG.json b/packages/ethereum-types/CHANGELOG.json
index 9a0f2ad49..6265e01a1 100644
--- a/packages/ethereum-types/CHANGELOG.json
+++ b/packages/ethereum-types/CHANGELOG.json
@@ -1,5 +1,23 @@
[
{
+ "timestamp": 1547561734,
+ "version": "1.1.6",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1547225310,
+ "version": "1.1.5",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"version": "1.1.4",
"changes": [
{
diff --git a/packages/ethereum-types/CHANGELOG.md b/packages/ethereum-types/CHANGELOG.md
index 1d27757f3..c1857495d 100644
--- a/packages/ethereum-types/CHANGELOG.md
+++ b/packages/ethereum-types/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.1.6 - _January 15, 2019_
+
+ * Dependencies updated
+
+## v1.1.5 - _January 11, 2019_
+
+ * Dependencies updated
+
## v1.1.4 - _December 13, 2018_
* Dependencies updated
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index 69ae64c2b..953b323c6 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -1,6 +1,6 @@
{
"name": "ethereum-types",
- "version": "1.1.4",
+ "version": "1.1.6",
"engines": {
"node": ">=6.12"
},
@@ -29,7 +29,7 @@
},
"homepage": "https://github.com/0xProject/0x-monorepo/packages/ethereum-types/README.md",
"devDependencies": {
- "@0x/tslint-config": "^2.0.0",
+ "@0x/tslint-config": "^2.0.2",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
"tslint": "5.11.0",
diff --git a/packages/ethereum-types/src/index.ts b/packages/ethereum-types/src/index.ts
index 9430fdc98..a8dcfd68a 100644
--- a/packages/ethereum-types/src/index.ts
+++ b/packages/ethereum-types/src/index.ts
@@ -306,6 +306,8 @@ export interface TraceParams {
disableMemory?: boolean;
disableStack?: boolean;
disableStorage?: boolean;
+ tracer?: string;
+ timeout?: string;
}
export type OutputField =