aboutsummaryrefslogtreecommitdiffstats
path: root/packages/deployer/src
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-04-10 20:06:43 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-04-12 18:50:52 +0800
commit4dd9f29769bea90a4b687be26b086164aaff685a (patch)
tree60bb5ce2b589114d01ddce38753e31bf78664ef3 /packages/deployer/src
parentf2f9bd2e7ac1372073644a4e30a5d99e8c57fbb1 (diff)
downloaddexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar.gz
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar.bz2
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar.lz
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar.xz
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.tar.zst
dexon-0x-contracts-4dd9f29769bea90a4b687be26b086164aaff685a.zip
Add ony abi-gen changes from Greg's PR
Diffstat (limited to 'packages/deployer/src')
-rw-r--r--packages/deployer/src/utils/contract.ts4
-rw-r--r--packages/deployer/src/utils/encoder.ts4
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/deployer/src/utils/contract.ts b/packages/deployer/src/utils/contract.ts
index 9b7baac11..e8dd5218a 100644
--- a/packages/deployer/src/utils/contract.ts
+++ b/packages/deployer/src/utils/contract.ts
@@ -1,11 +1,9 @@
import { schemas, SchemaValidator } from '@0xproject/json-schemas';
-import { ContractAbi, EventAbi, FunctionAbi, MethodAbi, TxData } from '@0xproject/types';
+import { AbiType, ContractAbi, EventAbi, FunctionAbi, MethodAbi, TxData } from '@0xproject/types';
import { promisify } from '@0xproject/utils';
import * as _ from 'lodash';
import * as Web3 from 'web3';
-import { AbiType } from './types';
-
export class Contract implements Web3.ContractInstance {
public address: string;
public abi: ContractAbi;
diff --git a/packages/deployer/src/utils/encoder.ts b/packages/deployer/src/utils/encoder.ts
index 4f62662e1..806efbbca 100644
--- a/packages/deployer/src/utils/encoder.ts
+++ b/packages/deployer/src/utils/encoder.ts
@@ -1,9 +1,7 @@
-import { AbiDefinition, ContractAbi, DataItem } from '@0xproject/types';
+import { AbiDefinition, AbiType, ContractAbi, DataItem } from '@0xproject/types';
import * as _ from 'lodash';
import * as web3Abi from 'web3-eth-abi';
-import { AbiType } from './types';
-
export const encoder = {
encodeConstructorArgsFromAbi(args: any[], abi: ContractAbi): string {
const constructorTypes: string[] = [];