diff options
author | Fabio Berger <me@fabioberger.com> | 2018-01-31 17:07:54 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-02-03 01:39:08 +0800 |
commit | 3eb40db498ab8e7a0a7dfc9f67299989288b4ea1 (patch) | |
tree | 462f2352f04aff8d1947ae653120e8ed32dbd48b | |
parent | 576f63d5e43725126d8a8a3aa4325c381dd78ceb (diff) | |
download | dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar.gz dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar.bz2 dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar.lz dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar.xz dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.tar.zst dexon-0x-contracts-3eb40db498ab8e7a0a7dfc9f67299989288b4ea1.zip |
Move all contracts into a single directory
-rw-r--r-- | packages/contracts/build/artifacts/DummyToken.json | 0 | ||||
-rw-r--r-- | packages/contracts/build/artifacts/ERC20Token.json | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/DummyToken/DummyToken.sol (renamed from packages/contracts/contracts/DummyToken/DummyToken.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/ERC20Token/ERC20Token.sol (renamed from packages/contracts/contracts/ERC20Token/ERC20Token.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/Exchange/Exchange.sol (renamed from packages/contracts/contracts/Exchange/Exchange.sol) | 4 | ||||
-rw-r--r-- | packages/contracts/contracts/current/MaliciousToken/MaliciousToken.sol (renamed from packages/contracts/contracts/MaliciousToken/MaliciousToken.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/Mintable/Mintable.sol (renamed from packages/contracts/contracts/Mintable/Mintable.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/MultiSigWallet/MultiSigWallet.sol (renamed from packages/contracts/contracts/MultiSigWallet/MultiSigWallet.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol (renamed from packages/contracts/contracts/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol (renamed from packages/contracts/contracts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/Ownable/Ownable.sol (renamed from packages/contracts/contracts/Ownable/Ownable.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/SafeMath/SafeMath.sol (renamed from packages/contracts/contracts/SafeMath/SafeMath.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/StandardToken/StandardToken.sol (renamed from packages/contracts/contracts/StandardToken/StandardToken.sol) | 2 | ||||
-rw-r--r-- | packages/contracts/contracts/current/Token/Token.sol (renamed from packages/contracts/contracts/Token/Token.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/TokenRegistry/TokenRegistry.sol (renamed from packages/contracts/contracts/TokenRegistry/TokenRegistry.sol) | 2 | ||||
-rw-r--r-- | packages/contracts/contracts/current/TokenTransferProxy/TokenTransferProxy.sol (renamed from packages/contracts/contracts/TokenTransferProxy/TokenTransferProxy.sol) | 4 | ||||
-rw-r--r-- | packages/contracts/contracts/current/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol (renamed from packages/contracts/contracts/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/WETH9/WETH9.sol (renamed from packages/contracts/contracts/WETH9/WETH9.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/current/ZRXToken/ZRXToken.sol (renamed from packages/contracts/contracts/ZRXToken/ZRXToken.sol) | 2 | ||||
-rw-r--r-- | packages/contracts/contracts/old/Ownable/v1.sol (renamed from packages/contracts/contracts_old/Ownable/v1.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/old/SafeMath/v1.sol (renamed from packages/contracts/contracts_old/SafeMath/v1.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/old/Token/v1.sol (renamed from packages/contracts/contracts_old/Token/v1.sol) | 0 | ||||
-rw-r--r-- | packages/contracts/contracts/old/UnlimitedAllowanceToken/v1.sol (renamed from packages/contracts/contracts_old/UnlimitedAllowanceToken/v1.sol) | 0 | ||||
-rw-r--r-- | packages/deployer/src/compiler.ts | 1 |
24 files changed, 8 insertions, 7 deletions
diff --git a/packages/contracts/build/artifacts/DummyToken.json b/packages/contracts/build/artifacts/DummyToken.json new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/contracts/build/artifacts/DummyToken.json diff --git a/packages/contracts/build/artifacts/ERC20Token.json b/packages/contracts/build/artifacts/ERC20Token.json new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packages/contracts/build/artifacts/ERC20Token.json diff --git a/packages/contracts/contracts/DummyToken/DummyToken.sol b/packages/contracts/contracts/current/DummyToken/DummyToken.sol index 67d6a818d..67d6a818d 100644 --- a/packages/contracts/contracts/DummyToken/DummyToken.sol +++ b/packages/contracts/contracts/current/DummyToken/DummyToken.sol diff --git a/packages/contracts/contracts/ERC20Token/ERC20Token.sol b/packages/contracts/contracts/current/ERC20Token/ERC20Token.sol index 976b5564e..976b5564e 100644 --- a/packages/contracts/contracts/ERC20Token/ERC20Token.sol +++ b/packages/contracts/contracts/current/ERC20Token/ERC20Token.sol diff --git a/packages/contracts/contracts/Exchange/Exchange.sol b/packages/contracts/contracts/current/Exchange/Exchange.sol index db2ce6584..690c9820f 100644 --- a/packages/contracts/contracts/Exchange/Exchange.sol +++ b/packages/contracts/contracts/current/Exchange/Exchange.sol @@ -19,8 +19,8 @@ pragma solidity ^0.4.11; import "../TokenTransferProxy/TokenTransferProxy.sol"; -import "../../contracts_old/Token/v1.sol"; -import "../../contracts_old/SafeMath/v1.sol"; +import "../../old/Token/v1.sol"; +import "../../old/SafeMath/v1.sol"; /// @title Exchange - Facilitates exchange of ERC20 tokens. /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com> diff --git a/packages/contracts/contracts/MaliciousToken/MaliciousToken.sol b/packages/contracts/contracts/current/MaliciousToken/MaliciousToken.sol index c3cace9af..c3cace9af 100644 --- a/packages/contracts/contracts/MaliciousToken/MaliciousToken.sol +++ b/packages/contracts/contracts/current/MaliciousToken/MaliciousToken.sol diff --git a/packages/contracts/contracts/Mintable/Mintable.sol b/packages/contracts/contracts/current/Mintable/Mintable.sol index 2dbc0f349..2dbc0f349 100644 --- a/packages/contracts/contracts/Mintable/Mintable.sol +++ b/packages/contracts/contracts/current/Mintable/Mintable.sol diff --git a/packages/contracts/contracts/MultiSigWallet/MultiSigWallet.sol b/packages/contracts/contracts/current/MultiSigWallet/MultiSigWallet.sol index ae7ef06fd..ae7ef06fd 100644 --- a/packages/contracts/contracts/MultiSigWallet/MultiSigWallet.sol +++ b/packages/contracts/contracts/current/MultiSigWallet/MultiSigWallet.sol diff --git a/packages/contracts/contracts/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol b/packages/contracts/contracts/current/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol index f8606762e..f8606762e 100644 --- a/packages/contracts/contracts/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol +++ b/packages/contracts/contracts/current/MultiSigWalletWithTimeLock/MultiSigWalletWithTimeLock.sol diff --git a/packages/contracts/contracts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol b/packages/contracts/contracts/current/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol index 81a3d4637..81a3d4637 100644 --- a/packages/contracts/contracts/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol +++ b/packages/contracts/contracts/current/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress/MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress.sol diff --git a/packages/contracts/contracts/Ownable/Ownable.sol b/packages/contracts/contracts/current/Ownable/Ownable.sol index 199c3c1c1..199c3c1c1 100644 --- a/packages/contracts/contracts/Ownable/Ownable.sol +++ b/packages/contracts/contracts/current/Ownable/Ownable.sol diff --git a/packages/contracts/contracts/SafeMath/SafeMath.sol b/packages/contracts/contracts/current/SafeMath/SafeMath.sol index 325bddc82..325bddc82 100644 --- a/packages/contracts/contracts/SafeMath/SafeMath.sol +++ b/packages/contracts/contracts/current/SafeMath/SafeMath.sol diff --git a/packages/contracts/contracts/StandardToken/StandardToken.sol b/packages/contracts/contracts/current/StandardToken/StandardToken.sol index fbb886c7b..9da3fa782 100644 --- a/packages/contracts/contracts/StandardToken/StandardToken.sol +++ b/packages/contracts/contracts/current/StandardToken/StandardToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.11; -import "../../contracts_old/Token/v1.sol"; +import "../../old/Token/v1.sol"; contract StandardToken is Token { diff --git a/packages/contracts/contracts/Token/Token.sol b/packages/contracts/contracts/current/Token/Token.sol index 8688bcae8..8688bcae8 100644 --- a/packages/contracts/contracts/Token/Token.sol +++ b/packages/contracts/contracts/current/Token/Token.sol diff --git a/packages/contracts/contracts/TokenRegistry/TokenRegistry.sol b/packages/contracts/contracts/current/TokenRegistry/TokenRegistry.sol index 2a0cab36d..29b42c0ef 100644 --- a/packages/contracts/contracts/TokenRegistry/TokenRegistry.sol +++ b/packages/contracts/contracts/current/TokenRegistry/TokenRegistry.sol @@ -18,7 +18,7 @@ pragma solidity ^0.4.11; -import "../../contracts_old/Ownable/v1.sol"; +import "../../old/Ownable/v1.sol"; /// @title Token Registry - Stores metadata associated with ERC20 tokens. See ERC22 https://github.com/ethereum/EIPs/issues/22 /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com> diff --git a/packages/contracts/contracts/TokenTransferProxy/TokenTransferProxy.sol b/packages/contracts/contracts/current/TokenTransferProxy/TokenTransferProxy.sol index f3fdbbee8..62adfaa8e 100644 --- a/packages/contracts/contracts/TokenTransferProxy/TokenTransferProxy.sol +++ b/packages/contracts/contracts/current/TokenTransferProxy/TokenTransferProxy.sol @@ -18,8 +18,8 @@ pragma solidity ^0.4.11; -import "../../contracts_old/Token/v1.sol"; -import "../../contracts_old/Ownable/v1.sol"; +import "../../old/Token/v1.sol"; +import "../../old/Ownable/v1.sol"; /// @title TokenTransferProxy - Transfers tokens on behalf of contracts that have been approved via decentralized governance. /// @author Amir Bandeali - <amir@0xProject.com>, Will Warren - <will@0xProject.com> diff --git a/packages/contracts/contracts/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol b/packages/contracts/contracts/current/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol index 52b80f8c8..52b80f8c8 100644 --- a/packages/contracts/contracts/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol +++ b/packages/contracts/contracts/current/UnlimitedAllowanceToken/UnlimitedAllowanceToken.sol diff --git a/packages/contracts/contracts/WETH9/WETH9.sol b/packages/contracts/contracts/current/WETH9/WETH9.sol index 733ca414b..733ca414b 100644 --- a/packages/contracts/contracts/WETH9/WETH9.sol +++ b/packages/contracts/contracts/current/WETH9/WETH9.sol diff --git a/packages/contracts/contracts/ZRXToken/ZRXToken.sol b/packages/contracts/contracts/current/ZRXToken/ZRXToken.sol index 876e58d05..7b293da61 100644 --- a/packages/contracts/contracts/ZRXToken/ZRXToken.sol +++ b/packages/contracts/contracts/current/ZRXToken/ZRXToken.sol @@ -18,7 +18,7 @@ pragma solidity ^0.4.11; -import "../../contracts_old/UnlimitedAllowanceToken/v1.sol"; +import "../../old/UnlimitedAllowanceToken/v1.sol"; contract ZRXToken is UnlimitedAllowanceToken { diff --git a/packages/contracts/contracts_old/Ownable/v1.sol b/packages/contracts/contracts/old/Ownable/v1.sol index 5488896d7..5488896d7 100644 --- a/packages/contracts/contracts_old/Ownable/v1.sol +++ b/packages/contracts/contracts/old/Ownable/v1.sol diff --git a/packages/contracts/contracts_old/SafeMath/v1.sol b/packages/contracts/contracts/old/SafeMath/v1.sol index e35c0dc81..e35c0dc81 100644 --- a/packages/contracts/contracts_old/SafeMath/v1.sol +++ b/packages/contracts/contracts/old/SafeMath/v1.sol diff --git a/packages/contracts/contracts_old/Token/v1.sol b/packages/contracts/contracts/old/Token/v1.sol index 507de9b12..507de9b12 100644 --- a/packages/contracts/contracts_old/Token/v1.sol +++ b/packages/contracts/contracts/old/Token/v1.sol diff --git a/packages/contracts/contracts_old/UnlimitedAllowanceToken/v1.sol b/packages/contracts/contracts/old/UnlimitedAllowanceToken/v1.sol index fc794998a..fc794998a 100644 --- a/packages/contracts/contracts_old/UnlimitedAllowanceToken/v1.sol +++ b/packages/contracts/contracts/old/UnlimitedAllowanceToken/v1.sol diff --git a/packages/deployer/src/compiler.ts b/packages/deployer/src/compiler.ts index 63db6c865..67c46989a 100644 --- a/packages/deployer/src/compiler.ts +++ b/packages/deployer/src/compiler.ts @@ -181,6 +181,7 @@ export class Compiler { ); if (!_.isUndefined(compiled.errors)) { + utils.consoleLog(compiled.errors); _.each(compiled.errors, errMsg => { const normalizedErrMsg = Compiler._getNormalizedErrMsg(errMsg); this._solcErrors.add(normalizedErrMsg); |