diff options
author | Jacob Evans <dekz@dekz.net> | 2018-12-04 09:44:19 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-04 09:44:19 +0800 |
commit | a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2 (patch) | |
tree | 22ae572b251938bd45e8fe23b1127e4a4a1a5a99 /contracts/core/src | |
parent | 8c146ce231ab0c3b6948afa21effe2a9bf228432 (diff) | |
parent | 098a531de8776df3776017001014078a21eb4029 (diff) | |
download | dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar.gz dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar.bz2 dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar.lz dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar.xz dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.tar.zst dexon-sol-tools-a1e985a1cac46ecbc54c7ef5b846fb5faf2bede2.zip |
Merge pull request #1225 from 0xProject/feature/contracts/dutch-auction
Implement Basic Dutch Auction
Diffstat (limited to 'contracts/core/src')
-rw-r--r-- | contracts/core/src/artifacts/index.ts | 2 | ||||
-rw-r--r-- | contracts/core/src/wrappers/index.ts | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/contracts/core/src/artifacts/index.ts b/contracts/core/src/artifacts/index.ts index 97c1b6209..8a8c5f4d4 100644 --- a/contracts/core/src/artifacts/index.ts +++ b/contracts/core/src/artifacts/index.ts @@ -6,6 +6,7 @@ import * as DummyERC721Receiver from '../../generated-artifacts/DummyERC721Recei import * as DummyERC721Token from '../../generated-artifacts/DummyERC721Token.json'; import * as DummyMultipleReturnERC20Token from '../../generated-artifacts/DummyMultipleReturnERC20Token.json'; import * as DummyNoReturnERC20Token from '../../generated-artifacts/DummyNoReturnERC20Token.json'; +import * as DutchAuction from '../../generated-artifacts/DutchAuction.json'; import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json'; import * as ERC20Token from '../../generated-artifacts/ERC20Token.json'; import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json'; @@ -45,6 +46,7 @@ export const artifacts = { DummyERC721Token: DummyERC721Token as ContractArtifact, DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + DutchAuction: DutchAuction as ContractArtifact, ERC20Proxy: ERC20Proxy as ContractArtifact, ERC20Token: ERC20Token as ContractArtifact, ERC721Proxy: ERC721Proxy as ContractArtifact, diff --git a/contracts/core/src/wrappers/index.ts b/contracts/core/src/wrappers/index.ts index 9ca676b56..e9e3f4e79 100644 --- a/contracts/core/src/wrappers/index.ts +++ b/contracts/core/src/wrappers/index.ts @@ -4,6 +4,7 @@ export * from '../../generated-wrappers/dummy_erc721_receiver'; export * from '../../generated-wrappers/dummy_erc721_token'; export * from '../../generated-wrappers/dummy_multiple_return_erc20_token'; export * from '../../generated-wrappers/dummy_no_return_erc20_token'; +export * from '../../generated-wrappers/dutch_auction'; export * from '../../generated-wrappers/erc20_proxy'; export * from '../../generated-wrappers/erc721_proxy'; export * from '../../generated-wrappers/erc20_token'; |