diff options
author | Fabio Berger <me@fabioberger.com> | 2019-02-07 22:28:24 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2019-02-07 22:28:24 +0800 |
commit | 3dd652e7cf6da63831da143b73c13231a46da376 (patch) | |
tree | 52218d0b88717360fa8bfadf4bbf7e35b9ab5f66 /contracts/asset-proxy/src | |
parent | 8de955f3d891620c90c668b4ac0b046e772d4da8 (diff) | |
parent | f003298ce4c7a2201d2d59685b0d5d0411aeb55d (diff) | |
download | dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.gz dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.bz2 dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.lz dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.xz dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.zst dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.zip |
Merge branch 'development' into addAnalyticsToDevToolsPages
* development: (51 commits)
Publish
Updated CHANGELOGS
Updated CHANGELOGS
Update packages/sol-compiler/CHANGELOG.json
Update packages/sol-compiler/CHANGELOG.json
Move from devDep to dep
Fix linter
Update CHANGELOG
Re-run yarn since fails again on first run
Add PR numbers
Omit remapping in compiler settings equality checks
Omit remapping in compiler settings equality checks
Fix a bug when ast and legacyAST were not present in the artifacts even if requested
Update yarn.lock
Remove the bin_paths and fetch the solidity release list from github repo
Remove postinstall hack
Fix the undefined opts bug
Fix sol-compiler bug with remappings causing smart recompilation to now work
re-add postinstall hack
Fix deps versions
...
Diffstat (limited to 'contracts/asset-proxy/src')
-rw-r--r-- | contracts/asset-proxy/src/artifacts.ts | 33 | ||||
-rw-r--r-- | contracts/asset-proxy/src/artifacts/index.ts | 19 | ||||
-rw-r--r-- | contracts/asset-proxy/src/wrappers.ts | 17 | ||||
-rw-r--r-- | contracts/asset-proxy/src/wrappers/index.ts | 7 |
4 files changed, 50 insertions, 26 deletions
diff --git a/contracts/asset-proxy/src/artifacts.ts b/contracts/asset-proxy/src/artifacts.ts new file mode 100644 index 000000000..d82c0537e --- /dev/null +++ b/contracts/asset-proxy/src/artifacts.ts @@ -0,0 +1,33 @@ +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ +import { ContractArtifact } from 'ethereum-types'; + +import * as DummyERC20Token from '../generated-artifacts/DummyERC20Token.json'; +import * as DummyERC721Receiver from '../generated-artifacts/DummyERC721Receiver.json'; +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 ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; +import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json'; +import * as IAssetData from '../generated-artifacts/IAssetData.json'; +import * as IAssetProxy from '../generated-artifacts/IAssetProxy.json'; +import * as IAuthorizable from '../generated-artifacts/IAuthorizable.json'; +import * as MixinAuthorizable from '../generated-artifacts/MixinAuthorizable.json'; +import * as MultiAssetProxy from '../generated-artifacts/MultiAssetProxy.json'; +export const artifacts = { + DummyERC20Token: DummyERC20Token as ContractArtifact, + DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact, + DummyNoReturnERC20Token: DummyNoReturnERC20Token as ContractArtifact, + DummyERC721Receiver: DummyERC721Receiver as ContractArtifact, + DummyERC721Token: DummyERC721Token as ContractArtifact, + ERC20Proxy: ERC20Proxy as ContractArtifact, + ERC721Proxy: ERC721Proxy as ContractArtifact, + MixinAuthorizable: MixinAuthorizable as ContractArtifact, + MultiAssetProxy: MultiAssetProxy as ContractArtifact, + IAssetData: IAssetData as ContractArtifact, + IAssetProxy: IAssetProxy as ContractArtifact, + IAuthorizable: IAuthorizable as ContractArtifact, +}; diff --git a/contracts/asset-proxy/src/artifacts/index.ts b/contracts/asset-proxy/src/artifacts/index.ts deleted file mode 100644 index 7f3060815..000000000 --- a/contracts/asset-proxy/src/artifacts/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ContractArtifact } from 'ethereum-types'; - -import * as ERC20Proxy from '../../generated-artifacts/ERC20Proxy.json'; -import * as ERC721Proxy from '../../generated-artifacts/ERC721Proxy.json'; -import * as IAssetData from '../../generated-artifacts/IAssetData.json'; -import * as IAssetProxy from '../../generated-artifacts/IAssetProxy.json'; -import * as IAuthorizable from '../../generated-artifacts/IAuthorizable.json'; -import * as MixinAuthorizable from '../../generated-artifacts/MixinAuthorizable.json'; -import * as MultiAssetProxy from '../../generated-artifacts/MultiAssetProxy.json'; - -export const artifacts = { - IAuthorizable: IAuthorizable as ContractArtifact, - IAssetData: IAssetData as ContractArtifact, - IAssetProxy: IAssetProxy as ContractArtifact, - ERC20Proxy: ERC20Proxy as ContractArtifact, - ERC721Proxy: ERC721Proxy as ContractArtifact, - MixinAuthorizable: MixinAuthorizable as ContractArtifact, - MultiAssetProxy: MultiAssetProxy as ContractArtifact, -}; diff --git a/contracts/asset-proxy/src/wrappers.ts b/contracts/asset-proxy/src/wrappers.ts new file mode 100644 index 000000000..f8cd342c0 --- /dev/null +++ b/contracts/asset-proxy/src/wrappers.ts @@ -0,0 +1,17 @@ +/* + * ----------------------------------------------------------------------------- + * Warning: This file is auto-generated by contracts-gen. Don't edit manually. + * ----------------------------------------------------------------------------- + */ +export * from '../generated-wrappers/dummy_erc20_token'; +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/erc20_proxy'; +export * from '../generated-wrappers/erc721_proxy'; +export * from '../generated-wrappers/i_asset_data'; +export * from '../generated-wrappers/i_asset_proxy'; +export * from '../generated-wrappers/i_authorizable'; +export * from '../generated-wrappers/mixin_authorizable'; +export * from '../generated-wrappers/multi_asset_proxy'; diff --git a/contracts/asset-proxy/src/wrappers/index.ts b/contracts/asset-proxy/src/wrappers/index.ts deleted file mode 100644 index 6aecbc086..000000000 --- a/contracts/asset-proxy/src/wrappers/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from '../../generated-wrappers/i_asset_data'; -export * from '../../generated-wrappers/i_asset_proxy'; -export * from '../../generated-wrappers/erc20_proxy'; -export * from '../../generated-wrappers/erc721_proxy'; -export * from '../../generated-wrappers/mixin_authorizable'; -export * from '../../generated-wrappers/multi_asset_proxy'; -export * from '../../generated-wrappers/i_authorizable'; |