From 5816e410e966223bf55afbc402ed17aef78dc9d1 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Fri, 1 Jun 2018 12:10:16 -0700 Subject: Use our fork of ethers.js --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7c54c1a18..af0b95dc4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "wsrun": "^2.2.0" }, "resolutions": { - "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default" + "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", + "ethers.js": "0xproject/ethers.js#eip-838-reasons" } } -- cgit v1.2.3 From 96da26777851cf3fcc00e8729f847ea631d023c1 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Fri, 1 Jun 2018 12:28:14 -0700 Subject: Fix ethers.js version override (the package is just called 'ethers') --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index af0b95dc4..f25438224 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,6 @@ }, "resolutions": { "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", - "ethers.js": "0xproject/ethers.js#eip-838-reasons" + "ethers": "0xproject/ethers.js#eip-838-reasons" } } -- cgit v1.2.3 From 98ffe9931d4fd8886955c45c42eb63b33184ddd2 Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Fri, 1 Jun 2018 14:03:12 -0700 Subject: Get LibBytes tests working on both Ganache and Geth --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index f25438224..20fcea3fd 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ }, "resolutions": { "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", - "ethers": "0xproject/ethers.js#eip-838-reasons" + "ethers": "0xproject/ethers.js#eip-838-reasons", + "ganache-core": "0xProject/ganache-core#feature/revert-strings" } } -- cgit v1.2.3 From fe121012784e0f1ed844c3ce6190e2d5b258b55e Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Tue, 5 Jun 2018 16:45:22 -0700 Subject: Update package.json and yarn.lock --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 20fcea3fd..f25438224 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ }, "resolutions": { "ethereumjs-tx": "0xProject/ethereumjs-tx#fake-tx-include-signature-by-default", - "ethers": "0xproject/ethers.js#eip-838-reasons", - "ganache-core": "0xProject/ganache-core#feature/revert-strings" + "ethers": "0xproject/ethers.js#eip-838-reasons" } } -- cgit v1.2.3