crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-asset-proxy: Rebase and use IERC20Bridge

Browse Source
This commit is contained in:
Lawrence Forman 2019-09-30 17:43:08 -07:00
parent 35daecd5ae
commit 1356237ec9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/asset-proxy/contracts/src/bridges/Eth2DaiBridge.sol
View File

@ -20,14 +20,14 @@ pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol"; import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
import "./ERC20Bridge.sol"; import "../interfaces/IERC20Bridge.sol";
import "../interfaces/IEth2Dai.sol"; import "../interfaces/IEth2Dai.sol";
import "../interfaces/IWallet.sol"; import "../interfaces/IWallet.sol";
// solhint-disable space-after-comma // solhint-disable space-after-comma
contract Eth2DaiBridge is contract Eth2DaiBridge is
ERC20Bridge, IERC20Bridge,
IWallet IWallet
{ {
/* Mainnet addresses */ /* Mainnet addresses */

2
contracts/asset-proxy/package.json
View File

@ -35,7 +35,7 @@
"compile:truffle": "truffle compile" "compile:truffle": "truffle compile"
}, },
"config": { "config": {
"abis": "./generated-artifacts/@(ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IERC20Bridge|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestERC20Bridge|TestStaticCallTarget).json", "abis": "./generated-artifacts/@(ERC1155Proxy|ERC20BridgeProxy|ERC20Proxy|ERC721Proxy|Eth2DaiBridge|IAssetData|IAssetProxy|IAssetProxyDispatcher|IAuthorizable|IERC20Bridge|IEth2Dai|IWallet|MixinAssetProxyDispatcher|MixinAuthorizable|MultiAssetProxy|Ownable|StaticCallProxy|TestERC20Bridge|TestEth2DaiBridge|TestStaticCallTarget).json",
"abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually."
}, },
"repository": { "repository": {

1
contracts/asset-proxy/src/artifacts.ts
View File

@ -35,6 +35,7 @@ export const artifacts = {
ERC721Proxy: ERC721Proxy as ContractArtifact, ERC721Proxy: ERC721Proxy as ContractArtifact,
MultiAssetProxy: MultiAssetProxy as ContractArtifact, MultiAssetProxy: MultiAssetProxy as ContractArtifact,
StaticCallProxy: StaticCallProxy as ContractArtifact, StaticCallProxy: StaticCallProxy as ContractArtifact,
Eth2DaiBridge: Eth2DaiBridge as ContractArtifact,
IAssetData: IAssetData as ContractArtifact, IAssetData: IAssetData as ContractArtifact,
IAssetProxy: IAssetProxy as ContractArtifact, IAssetProxy: IAssetProxy as ContractArtifact,
IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact, IAssetProxyDispatcher: IAssetProxyDispatcher as ContractArtifact,

2
contracts/asset-proxy/test/eth2dai_bridge.ts
View File

@ -24,7 +24,7 @@ import {
TestEth2DaiBridgeTokenTransferEventArgs, TestEth2DaiBridgeTokenTransferEventArgs,
} from '../src'; } from '../src';
blockchainTests.resets.only('Eth2DaiBridge unit tests', env => { blockchainTests.resets('Eth2DaiBridge unit tests', env => {
const txHelper = new TransactionHelper(env.web3Wrapper, artifacts); const txHelper = new TransactionHelper(env.web3Wrapper, artifacts);
let testContract: TestEth2DaiBridgeContract; let testContract: TestEth2DaiBridgeContract;