aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-11-21 07:06:46 +0800
committerFabio Berger <me@fabioberger.com>2018-11-21 07:06:46 +0800
commit4b64d8c3aad3e1fa3d807941e70f2901941c2501 (patch)
treef19a1c0c08f9a7023f690e7b44b7f50d297a7923 /packages
parent48aec9ef472cd161434cf58c58e63227beb565c4 (diff)
downloaddexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar.gz
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar.bz2
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar.lz
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar.xz
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.tar.zst
dexon-sol-tools-4b64d8c3aad3e1fa3d807941e70f2901941c2501.zip
Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync`
Diffstat (limited to 'packages')
-rw-r--r--packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts3
-rw-r--r--packages/contract_templates/contract.handlebars3
-rw-r--r--packages/types/src/index.ts9
3 files changed, 12 insertions, 3 deletions
diff --git a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts
index ffd498055..a04b6025e 100644
--- a/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts
+++ b/packages/abi-gen-wrappers/src/generated-wrappers/exchange.ts
@@ -4,6 +4,7 @@
import { BaseContract } from '@0x/base-contract';
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
import { BigNumber, classUtils, logUtils } from '@0x/utils';
+import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
@@ -3024,7 +3025,7 @@ export class ExchangeContract extends BaseContract {
},
};
public static async deployFrom0xArtifactAsync(
- artifact: ContractArtifact,
+ artifact: ContractArtifact | SimpleContractArtifact,
provider: Provider,
txDefaults: Partial<TxData>,
): Promise<ExchangeContract> {
diff --git a/packages/contract_templates/contract.handlebars b/packages/contract_templates/contract.handlebars
index 9c1952ed4..9b2a2b336 100644
--- a/packages/contract_templates/contract.handlebars
+++ b/packages/contract_templates/contract.handlebars
@@ -4,6 +4,7 @@
import { BaseContract } from '@0x/base-contract';
import { BlockParam, BlockParamLiteral, CallData, ContractAbi, ContractArtifact, DecodedLogArgs, MethodAbi, Provider, TxData, TxDataPayable } from 'ethereum-types';
import { BigNumber, classUtils, logUtils } from '@0x/utils';
+import { SimpleContractArtifact } from '@0x/types';
import { Web3Wrapper } from '@0x/web3-wrapper';
import * as ethers from 'ethers';
import * as _ from 'lodash';
@@ -40,7 +41,7 @@ export class {{contractName}}Contract extends BaseContract {
{{/this.constant}}
{{/each}}
public static async deployFrom0xArtifactAsync(
- artifact: ContractArtifact,
+ artifact: ContractArtifact | SimpleContractArtifact,
provider: Provider,
txDefaults: Partial<TxData>,
{{> typed_params inputs=ctor.inputs}}
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 3c9b6bbc5..fd40f361a 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -1,7 +1,7 @@
// tslint:disable:max-file-line-count
import { BigNumber } from 'bignumber.js';
-import { ContractAbi } from 'ethereum-types';
+import { ContractAbi, ContractNetworks, StandardContractOutput } from 'ethereum-types';
// HACK: Rather then extending from OrderWithoutExchangeAddress
// we don't, because our docs don't expand inherited types, and it's unnecessarily
@@ -626,3 +626,10 @@ export interface EIP712TypedData {
export interface Stats {
orderCount: number;
}
+
+export interface SimpleContractArtifact {
+ schemaVersion: string;
+ contractName: string;
+ compilerOutput: StandardContractOutput;
+ networks: ContractNetworks;
+}