diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-07-28 02:51:30 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-07-28 02:51:30 +0800 |
| commit | c851c3763060ca4cf9e37d75e36e534f9b7d9294 (patch) | |
| tree | 82bb74e4521804377869c099cf5eba019f06d4d5 /packages/subproviders/src | |
| parent | a0d7b1efa59cf7322a97ef75268c372068592976 (diff) | |
| parent | 44d1be27e626c4e80ccf80d3f070a890c45f02ac (diff) | |
| download | dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.gz dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.bz2 dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.lz dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.xz dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.tar.zst dexon-sol-tools-c851c3763060ca4cf9e37d75e36e534f9b7d9294.zip | |
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/upgrade-allowance-toggles-to-locks-and-checks
Diffstat (limited to 'packages/subproviders/src')
| -rw-r--r-- | packages/subproviders/src/subproviders/signer.ts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/subproviders/src/subproviders/signer.ts b/packages/subproviders/src/subproviders/signer.ts index d5fd86897..8c4e89caf 100644 --- a/packages/subproviders/src/subproviders/signer.ts +++ b/packages/subproviders/src/subproviders/signer.ts @@ -1,4 +1,5 @@ -import { marshaller, Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { marshaller } from '@0xproject/web3-wrapper/lib/src/marshaller'; import { JSONRPCRequestPayload, Provider } from 'ethereum-types'; import { Callback, ErrorCallback } from '../types'; |