diff options
author | Fabio Berger <me@fabioberger.com> | 2018-11-21 23:14:26 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-11-21 23:14:26 +0800 |
commit | 584dc6217d45f53294102a98f6222c5dc6b788c1 (patch) | |
tree | 927f17e68d6baf8ea86a8f2e5a68aaeb6daa08a2 /packages/types | |
parent | edf07d9b5b2be0384cf1adb53023845662f9c5e4 (diff) | |
parent | f66b695a470af8bd87fda017384e3059e66b10d8 (diff) | |
download | dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.gz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.bz2 dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.lz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.xz dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.tar.zst dexon-sol-tools-584dc6217d45f53294102a98f6222c5dc6b788c1.zip |
Merge branch 'development' of github.com:0xProject/0x-monorepo into development
* 'development' of github.com:0xProject/0x-monorepo:
Add additional CHANGELOG to types package
Add CHANGELOG entry
Fix prettier
Fix `SimpleContractArtifact` type
Update abi-gen-wrappers
Add @0x/types to dependencies of `@0x/abi-gen-wrappers`
Allow a `SimpleContractArtifact` to be passed into `deployFrom0xArtifactAsync`
Update issue template
fix(instant): Use new valid svg image for instant
isDisabled -> isInputDisabled
Allow user to select other token on success
fix: do not use document on import
fix(instant): Don't allow changing of assets when order processing
fix: npmignore file ignoring index.d.ts
fix: specify new location of index.js in package.json
feat: fix instant build and add to project references
chore: make instant public
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/CHANGELOG.json | 10 | ||||
-rw-r--r-- | packages/types/src/index.ts | 23 |
2 files changed, 32 insertions, 1 deletions
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 6d9f83c57..ecab7e9d6 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,5 +1,15 @@ [ { + "version": "1.3.0", + "changes": [ + { + "note": + "Add the `SimpleContractArtifact` type, which describes the artifact format published in the `@0x/contract-artifacts` package", + "pr": 1298 + } + ] + }, + { "version": "1.2.1", "changes": [ { diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 3c9b6bbc5..1a86f45e6 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, DevdocOutput } 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,24 @@ export interface EIP712TypedData { export interface Stats { orderCount: number; } + +export interface SimpleContractArtifact { + schemaVersion: string; + contractName: string; + compilerOutput: SimpleStandardContractOutput; + networks: ContractNetworks; +} + +export interface SimpleStandardContractOutput { + abi: ContractAbi; + evm: SimpleEvmOutput; + devdoc?: DevdocOutput; +} + +export interface SimpleEvmOutput { + bytecode: SimpleEvmBytecodeOutput; +} + +export interface SimpleEvmBytecodeOutput { + object: string; +} |