@0x/contracts-asset-proxy: Merge ERC20Bridge into IERC20Bridge.

0xProject · Oct 1, 2019 · 6da48be · 6da48be
1 parent 579dba1
commit 6da48be
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 38 deletions.
diff --git a/contracts/asset-proxy/contracts/src/bridges/ERC20Bridge.sol b/contracts/asset-proxy/contracts/src/bridges/ERC20Bridge.sol
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",