diff --git a/contracts/asset-proxy/contracts/src/bridges/ERC20Bridge.sol b/contracts/asset-proxy/contracts/src/bridges/ERC20Bridge.sol deleted file mode 100644 index 74351f3922..0000000000 --- a/contracts/asset-proxy/contracts/src/bridges/ERC20Bridge.sol +++ /dev/null @@ -1,30 +0,0 @@ -/* - - Copyright 2019 ZeroEx Intl. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -*/ - -pragma solidity ^0.5.9; -pragma experimental ABIEncoderV2; - -import "../interfaces/IERC20Bridge.sol"; - - -contract ERC20Bridge is - IERC20Bridge -{ - // @dev Result of a successful bridge call. - bytes4 constant internal BRIDGE_SUCCESS = 0xdc1600f3; -} diff --git a/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol b/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol index 1ee1361fbe..947aa475bb 100644 --- a/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol +++ b/contracts/asset-proxy/contracts/src/interfaces/IERC20Bridge.sol @@ -19,7 +19,10 @@ pragma solidity ^0.5.9; -interface IERC20Bridge { +contract IERC20Bridge { + + // @dev Result of a successful bridge call. + bytes4 constant internal BRIDGE_SUCCESS = 0xdc1600f3; /// @dev Transfers `amount` of the ERC20 `tokenAddress` from `from` to `to`. /// @param tokenAddress The address of the ERC20 token to transfer. diff --git a/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol b/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol index e6b3441658..197ee3eb11 100644 --- a/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol +++ b/contracts/asset-proxy/contracts/test/TestERC20Bridge.sol @@ -19,7 +19,7 @@ pragma solidity ^0.5.9; pragma experimental ABIEncoderV2; -import "../src/bridges/ERC20Bridge.sol"; +import "../src/interfaces/IERC20Bridge.sol"; /// @dev Test bridge token @@ -50,7 +50,7 @@ contract TestERC20BridgeToken { /// @dev Test bridge contract. contract TestERC20Bridge is - ERC20Bridge + IERC20Bridge { TestERC20BridgeToken public testToken; diff --git a/contracts/asset-proxy/package.json b/contracts/asset-proxy/package.json index a442bdae07..702a17e35f 100644 --- a/contracts/asset-proxy/package.json +++ b/contracts/asset-proxy/package.json @@ -35,7 +35,7 @@ "compile:truffle": "truffle compile" }, "config": { - "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20Bridge|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IERC20Bridge|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestERC20Bridge|TestStaticCallTarget).json", + "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IERC20Bridge|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestERC20Bridge|TestStaticCallTarget).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/asset-proxy/src/artifacts.ts b/contracts/asset-proxy/src/artifacts.ts index 3c82130b49..add295190b 100644 --- a/contracts/asset-proxy/src/artifacts.ts +++ b/contracts/asset-proxy/src/artifacts.ts @@ -6,7 +6,6 @@ import { ContractArtifact } from 'ethereum-types'; import * as ERC1155Proxy from '../generated-artifacts/ERC1155Proxy.json'; -import * as ERC20Bridge from '../generated-artifacts/ERC20Bridge.json'; import * as ERC20BridgeProxy from '../generated-artifacts/ERC20BridgeProxy.json'; import * as ERC20Proxy from '../generated-artifacts/ERC20Proxy.json'; import * as ERC721Proxy from '../generated-artifacts/ERC721Proxy.json'; @@ -32,7 +31,6 @@ export const artifacts = { ERC721Proxy: ERC721Proxy as ContractArtifact, MultiAssetProxy: MultiAssetProxy as ContractArtifact, StaticCallProxy: StaticCallProxy as ContractArtifact, - ERC20Bridge: ERC20Bridge as ContractArtifact, IAssetData: IAssetData as ContractArtifact, IAssetProxy: IAssetProxy as ContractArtifact, IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, diff --git a/contracts/asset-proxy/src/wrappers.ts b/contracts/asset-proxy/src/wrappers.ts index a72cdf72de..16578fd181 100644 --- a/contracts/asset-proxy/src/wrappers.ts +++ b/contracts/asset-proxy/src/wrappers.ts @@ -4,7 +4,6 @@ * ----------------------------------------------------------------------------- */ export * from '../generated-wrappers/erc1155_proxy'; -export * from '../generated-wrappers/erc20_bridge'; export * from '../generated-wrappers/erc20_bridge_proxy'; export * from '../generated-wrappers/erc20_proxy'; export * from '../generated-wrappers/erc721_proxy'; diff --git a/contracts/asset-proxy/tsconfig.json b/contracts/asset-proxy/tsconfig.json index a0a766a352..9c332c4a33 100644 --- a/contracts/asset-proxy/tsconfig.json +++ b/contracts/asset-proxy/tsconfig.json @@ -4,7 +4,6 @@ "include": ["./src/**/*", "./test/**/*", "./generated-wrappers/**/*"], "files": [ "generated-artifacts/ERC1155Proxy.json", - "generated-artifacts/ERC20Bridge.json", "generated-artifacts/ERC20BridgeProxy.json", "generated-artifacts/ERC20Proxy.json", "generated-artifacts/ERC721Proxy.json",