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

Fix zeppelin imports, run prettier

Browse Source
This commit is contained in:
Amir Bandeali
2018-04-19 12:18:53 -07:00
parent a0c7da95c2
commit e532f2c165
6 changed files with 271 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/contracts/package.json
View File

@@ -27,8 +27,7 @@
},
"config": {
"abis": "../migrations/src/artifacts/@(DummyToken|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|AssetProxyDispatcher|ERC20Proxy|ERC721Proxy|DummyERC721Token|LibBytes).json",
"contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,AssetProxyDispatcher,ERC20Proxy,ERC721Proxy,DummyERC721Token,LibBytes",
"contract_dirs": "src/contracts,zeppelin:../../node_modules/zeppelin-solidity"
"contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,AssetProxyDispatcher,ERC20Proxy,ERC721Proxy,DummyERC721Token,LibBytes"
},
"repository": {
"type": "git",

2
packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol
View File

@@ -21,7 +21,7 @@ pragma solidity ^0.4.21;
import "../IAssetProxy.sol";
import "../../../utils/LibBytes/LibBytes.sol";
import "../../../utils/Authorizable/Authorizable.sol";
import "/zeppelin/contracts/token/ERC721/ERC721Token.sol";
import "zeppelin-solidity/contracts/token/ERC721/ERC721Token.sol";
contract ERC721Proxy is
LibBytes,

2
packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol
View File

@@ -17,7 +17,7 @@
*/
pragma solidity ^0.4.21;
import "/zeppelin/contracts/token/ERC721/ERC721Token.sol";
import "zeppelin-solidity/contracts/token/ERC721/ERC721Token.sol";
import "../../utils/Ownable/Ownable.sol";
contract DummyERC721Token is