diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-04-20 03:18:53 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:57:18 +0800 |
| commit | e532f2c1650d845aa1186daa8983de18d8affc3c (patch) | |
| tree | 8a367338d5fd40951d5fb6a002995946452a3a80 /packages | |
| parent | a0c7da95c25bbfc324026acb0c8ee162bb25859e (diff) | |
| download | dexon-sol-tools-e532f2c1650d845aa1186daa8983de18d8affc3c.tar.gz dexon-sol-tools-e532f2c1650d845aa1186daa8983de18d8affc3c.tar.zst dexon-sol-tools-e532f2c1650d845aa1186daa8983de18d8affc3c.zip | |
Fix zeppelin imports, run prettier
Diffstat (limited to 'packages')
5 files changed, 9 insertions, 6 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index db9022373..78585e8e7 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -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", diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol index 9021acd40..466d0b871 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxyDispatcher/proxies/ERC721Proxy.sol @@ -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, diff --git a/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol b/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol index 07b179c76..7a635f15f 100644 --- a/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol +++ b/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol @@ -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 diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index e90dfa747..b7ba2241c 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -784,7 +784,9 @@ export class Blockchain { const provider = await Blockchain._getProviderAsync(injectedWeb3, networkIdIfExists); this.networkId = !_.isUndefined(networkIdIfExists) ? networkIdIfExists - : configs.IS_MAINNET_ENABLED ? constants.NETWORK_ID_MAINNET : constants.NETWORK_ID_KOVAN; + : configs.IS_MAINNET_ENABLED + ? constants.NETWORK_ID_MAINNET + : constants.NETWORK_ID_KOVAN; this._dispatcher.updateNetworkId(this.networkId); const zeroExConfigs = { networkId: this.networkId, diff --git a/packages/website/ts/components/top_bar/provider_display.tsx b/packages/website/ts/components/top_bar/provider_display.tsx index 221c34f8c..79e7c3e2d 100644 --- a/packages/website/ts/components/top_bar/provider_display.tsx +++ b/packages/website/ts/components/top_bar/provider_display.tsx @@ -32,7 +32,9 @@ export class ProviderDisplay extends React.Component<ProviderDisplayProps, Provi this.props.providerType === ProviderType.Injected && this.props.injectedProviderName !== '0x Public'; const displayAddress = isAddressAvailable ? utils.getAddressBeginAndEnd(this.props.userAddress) - : isExternallyInjectedProvider ? 'Account locked' : '0x0000...0000'; + : isExternallyInjectedProvider + ? 'Account locked' + : '0x0000...0000'; // If the "injected" provider is our fallback public node, then we want to // show the "connect a wallet" message instead of the providerName const injectedProviderName = isExternallyInjectedProvider |