diff --git a/contracts/dev-utils/contracts/src/OrderTransferSimulationUtils.sol b/contracts/dev-utils/contracts/src/OrderTransferSimulationUtils.sol index de5f1d3276..ffef8309a5 100644 --- a/contracts/dev-utils/contracts/src/OrderTransferSimulationUtils.sol +++ b/contracts/dev-utils/contracts/src/OrderTransferSimulationUtils.sol @@ -21,8 +21,8 @@ pragma experimental ABIEncoderV2; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol"; -import "@0x/contracts-exchange/contracts/src/LibExchangeRichErrors.sol"; import "@0x/contracts-exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol"; diff --git a/contracts/exchange/contracts/src/LibExchangeRichErrors.sol b/contracts/exchange-libs/contracts/src/LibExchangeRichErrors.sol similarity index 93% rename from contracts/exchange/contracts/src/LibExchangeRichErrors.sol rename to contracts/exchange-libs/contracts/src/LibExchangeRichErrors.sol index 732ba24baf..5cb656f575 100644 --- a/contracts/exchange/contracts/src/LibExchangeRichErrors.sol +++ b/contracts/exchange-libs/contracts/src/LibExchangeRichErrors.sol @@ -19,12 +19,44 @@ pragma solidity ^0.5.9; import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; -import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; -import "./interfaces/IExchangeRichErrors.sol"; +import "./LibOrder.sol"; library LibExchangeRichErrors { + enum AssetProxyDispatchErrorCodes { + INVALID_ASSET_DATA_LENGTH, + UNKNOWN_ASSET_PROXY + } + + enum BatchMatchOrdersErrorCodes { + ZERO_LEFT_ORDERS, + ZERO_RIGHT_ORDERS, + INVALID_LENGTH_LEFT_SIGNATURES, + INVALID_LENGTH_RIGHT_SIGNATURES + } + + enum FillErrorCodes { + INVALID_TAKER_AMOUNT, + TAKER_OVERPAY, + OVERFILL, + INVALID_FILL_PRICE + } + + enum SignatureErrorCodes { + BAD_SIGNATURE, + INVALID_LENGTH, + UNSUPPORTED, + ILLEGAL, + INAPPROPRIATE_SIGNATURE_TYPE + } + + enum TransactionErrorCodes { + NO_REENTRANCY, + ALREADY_EXECUTED, + EXPIRED + } + // bytes4(keccak256("SignatureError(uint8,bytes32,address,bytes)")) bytes4 internal constant SIGNATURE_ERROR_SELECTOR = 0x7e5a2318; @@ -255,7 +287,7 @@ library LibExchangeRichErrors { } function BatchMatchOrdersError( - IExchangeRichErrors.BatchMatchOrdersErrorCodes errorCode + BatchMatchOrdersErrorCodes errorCode ) internal pure @@ -268,7 +300,7 @@ library LibExchangeRichErrors { } function SignatureError( - IExchangeRichErrors.SignatureErrorCodes errorCode, + SignatureErrorCodes errorCode, bytes32 hash, address signerAddress, bytes memory signature @@ -387,7 +419,7 @@ library LibExchangeRichErrors { } function FillError( - IExchangeRichErrors.FillErrorCodes errorCode, + FillErrorCodes errorCode, bytes32 orderHash ) internal @@ -447,7 +479,7 @@ library LibExchangeRichErrors { } function AssetProxyDispatchError( - IExchangeRichErrors.AssetProxyDispatchErrorCodes errorCode, + AssetProxyDispatchErrorCodes errorCode, bytes32 orderHash, bytes memory assetData ) @@ -496,7 +528,7 @@ library LibExchangeRichErrors { } function TransactionError( - IExchangeRichErrors.TransactionErrorCodes errorCode, + TransactionErrorCodes errorCode, bytes32 transactionHash ) internal diff --git a/contracts/exchange/contracts/src/Exchange.sol b/contracts/exchange/contracts/src/Exchange.sol index 337ca7055d..c13e0f0d05 100644 --- a/contracts/exchange/contracts/src/Exchange.sol +++ b/contracts/exchange/contracts/src/Exchange.sol @@ -19,18 +19,18 @@ pragma solidity ^0.5.9; pragma experimental ABIEncoderV2; +import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol"; import "./MixinMatchOrders.sol"; -import "./MixinSignatureValidator.sol"; import "./MixinWrapperFunctions.sol"; import "./MixinTransferSimulator.sol"; // solhint-disable no-empty-blocks -// MixinAssetProxyDispatcher, MixinExchangeCore, MixinExchangeRichErrors, +// MixinAssetProxyDispatcher, MixinExchangeCore, MixinSignatureValidator, // and MixinTransactions are all inherited via the other Mixins that are // used. contract Exchange is - MixinSignatureValidator, + LibEIP712ExchangeDomain, MixinMatchOrders, MixinWrapperFunctions, MixinTransferSimulator @@ -42,12 +42,5 @@ contract Exchange is constructor (uint256 chainId) public LibEIP712ExchangeDomain(chainId, address(0)) - MixinExchangeCore() - MixinMatchOrders() - MixinSignatureValidator() - MixinTransactions() - MixinAssetProxyDispatcher() - MixinTransferSimulator() - MixinWrapperFunctions() {} } diff --git a/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol b/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol index 066c104e60..26d018c603 100644 --- a/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol +++ b/contracts/exchange/contracts/src/MixinAssetProxyDispatcher.sol @@ -21,10 +21,9 @@ pragma solidity ^0.5.9; import "@0x/contracts-utils/contracts/src/Ownable.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "./interfaces/IAssetProxy.sol"; import "./interfaces/IAssetProxyDispatcher.sol"; -import "./interfaces/IExchangeRichErrors.sol"; -import "./LibExchangeRichErrors.sol"; contract MixinAssetProxyDispatcher is @@ -89,7 +88,7 @@ contract MixinAssetProxyDispatcher is // Ensure assetData length is valid if (assetData.length <= 3) { LibRichErrors.rrevert(LibExchangeRichErrors.AssetProxyDispatchError( - IExchangeRichErrors.AssetProxyDispatchErrorCodes.INVALID_ASSET_DATA_LENGTH, + LibExchangeRichErrors.AssetProxyDispatchErrorCodes.INVALID_ASSET_DATA_LENGTH, orderHash, assetData )); @@ -102,7 +101,7 @@ contract MixinAssetProxyDispatcher is // Ensure that assetProxy exists if (assetProxy == address(0)) { LibRichErrors.rrevert(LibExchangeRichErrors.AssetProxyDispatchError( - IExchangeRichErrors.AssetProxyDispatchErrorCodes.UNKNOWN_ASSET_PROXY, + LibExchangeRichErrors.AssetProxyDispatchErrorCodes.UNKNOWN_ASSET_PROXY, orderHash, assetData )); diff --git a/contracts/exchange/contracts/src/MixinExchangeCore.sol b/contracts/exchange/contracts/src/MixinExchangeCore.sol index 413f503bf6..e94669e824 100644 --- a/contracts/exchange/contracts/src/MixinExchangeCore.sol +++ b/contracts/exchange/contracts/src/MixinExchangeCore.sol @@ -24,9 +24,8 @@ import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "./interfaces/IExchangeCore.sol"; -import "./interfaces/IExchangeRichErrors.sol"; -import "./LibExchangeRichErrors.sol"; import "./MixinAssetProxyDispatcher.sol"; import "./MixinSignatureValidator.sol"; @@ -368,7 +367,7 @@ contract MixinExchangeCore is orderInfo.orderHash, signature)) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.BAD_SIGNATURE, + LibExchangeRichErrors.SignatureErrorCodes.BAD_SIGNATURE, orderInfo.orderHash, makerAddress, signature diff --git a/contracts/exchange/contracts/src/MixinMatchOrders.sol b/contracts/exchange/contracts/src/MixinMatchOrders.sol index 0e0b09c46f..2ed8125a13 100644 --- a/contracts/exchange/contracts/src/MixinMatchOrders.sol +++ b/contracts/exchange/contracts/src/MixinMatchOrders.sol @@ -18,9 +18,8 @@ import "@0x/contracts-utils/contracts/src/LibBytes.sol"; import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol"; -import "./interfaces/IExchangeRichErrors.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "./interfaces/IMatchOrders.sol"; -import "./LibExchangeRichErrors.sol"; import "./MixinExchangeCore.sol"; @@ -197,24 +196,24 @@ contract MixinMatchOrders is // Ensure that the left and right orders have nonzero lengths. if (leftOrders.length == 0) { LibRichErrors.rrevert(LibExchangeRichErrors.BatchMatchOrdersError( - IExchangeRichErrors.BatchMatchOrdersErrorCodes.ZERO_LEFT_ORDERS + LibExchangeRichErrors.BatchMatchOrdersErrorCodes.ZERO_LEFT_ORDERS )); } if (rightOrders.length == 0) { LibRichErrors.rrevert(LibExchangeRichErrors.BatchMatchOrdersError( - IExchangeRichErrors.BatchMatchOrdersErrorCodes.ZERO_RIGHT_ORDERS + LibExchangeRichErrors.BatchMatchOrdersErrorCodes.ZERO_RIGHT_ORDERS )); } // Ensure that the left and right arrays are compatible. if (leftOrders.length != leftSignatures.length) { LibRichErrors.rrevert(LibExchangeRichErrors.BatchMatchOrdersError( - IExchangeRichErrors.BatchMatchOrdersErrorCodes.INVALID_LENGTH_LEFT_SIGNATURES + LibExchangeRichErrors.BatchMatchOrdersErrorCodes.INVALID_LENGTH_LEFT_SIGNATURES )); } if (rightOrders.length != rightSignatures.length) { LibRichErrors.rrevert(LibExchangeRichErrors.BatchMatchOrdersError( - IExchangeRichErrors.BatchMatchOrdersErrorCodes.INVALID_LENGTH_RIGHT_SIGNATURES + LibExchangeRichErrors.BatchMatchOrdersErrorCodes.INVALID_LENGTH_RIGHT_SIGNATURES )); } diff --git a/contracts/exchange/contracts/src/MixinSignatureValidator.sol b/contracts/exchange/contracts/src/MixinSignatureValidator.sol index fb698e0b15..fdb533d4ba 100644 --- a/contracts/exchange/contracts/src/MixinSignatureValidator.sol +++ b/contracts/exchange/contracts/src/MixinSignatureValidator.sol @@ -26,11 +26,10 @@ import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "./interfaces/IWallet.sol"; import "./interfaces/IEIP1271Wallet.sol"; -import "./interfaces/IExchangeRichErrors.sol"; import "./interfaces/ISignatureValidator.sol"; -import "./LibExchangeRichErrors.sol"; import "./MixinTransactions.sol"; @@ -112,7 +111,7 @@ contract MixinSignatureValidator is signatureType == SignatureType.EIP1271Wallet ) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.INAPPROPRIATE_SIGNATURE_TYPE, + LibExchangeRichErrors.SignatureErrorCodes.INAPPROPRIATE_SIGNATURE_TYPE, hash, signerAddress, signature @@ -308,7 +307,7 @@ contract MixinSignatureValidator is if (signatureType == SignatureType.Invalid) { if (signature.length != 1) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, + LibExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, hash, signerAddress, signature @@ -320,7 +319,7 @@ contract MixinSignatureValidator is } else if (signatureType == SignatureType.EIP712) { if (signature.length != 66) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, + LibExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, hash, signerAddress, signature @@ -341,7 +340,7 @@ contract MixinSignatureValidator is } else if (signatureType == SignatureType.EthSign) { if (signature.length != 66) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, + LibExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, hash, signerAddress, signature @@ -400,7 +399,7 @@ contract MixinSignatureValidator is if (signature.length == 0) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, + LibExchangeRichErrors.SignatureErrorCodes.INVALID_LENGTH, hash, signerAddress, signature @@ -413,7 +412,7 @@ contract MixinSignatureValidator is // Ensure signature is supported if (signatureTypeRaw >= uint8(SignatureType.NSignatureTypes)) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.UNSUPPORTED, + LibExchangeRichErrors.SignatureErrorCodes.UNSUPPORTED, hash, signerAddress, signature @@ -427,7 +426,7 @@ contract MixinSignatureValidator is // also the initialization value for the enum type. if (SignatureType(signatureTypeRaw) == SignatureType.Illegal) { LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError( - IExchangeRichErrors.SignatureErrorCodes.ILLEGAL, + LibExchangeRichErrors.SignatureErrorCodes.ILLEGAL, hash, signerAddress, signature diff --git a/contracts/exchange/contracts/src/MixinTransactions.sol b/contracts/exchange/contracts/src/MixinTransactions.sol index 21b2d2da3b..c71be180ca 100644 --- a/contracts/exchange/contracts/src/MixinTransactions.sol +++ b/contracts/exchange/contracts/src/MixinTransactions.sol @@ -21,11 +21,10 @@ pragma experimental ABIEncoderV2; import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibEIP712ExchangeDomain.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; -import "./interfaces/IExchangeRichErrors.sol"; import "./interfaces/ITransactions.sol"; import "./interfaces/ISignatureValidator.sol"; -import "./LibExchangeRichErrors.sol"; contract MixinTransactions is @@ -92,7 +91,7 @@ contract MixinTransactions is // solhint-disable-next-line not-rely-on-time if (block.timestamp >= transaction.expirationTimeSeconds) { LibRichErrors.rrevert(LibExchangeRichErrors.TransactionError( - IExchangeRichErrors.TransactionErrorCodes.EXPIRED, + LibExchangeRichErrors.TransactionErrorCodes.EXPIRED, transactionHash )); } @@ -100,7 +99,7 @@ contract MixinTransactions is // Prevent reentrancy if (currentContextAddress != address(0)) { LibRichErrors.rrevert(LibExchangeRichErrors.TransactionError( - IExchangeRichErrors.TransactionErrorCodes.NO_REENTRANCY, + LibExchangeRichErrors.TransactionErrorCodes.NO_REENTRANCY, transactionHash )); } @@ -108,7 +107,7 @@ contract MixinTransactions is // Validate transaction has not been executed if (transactionsExecuted[transactionHash]) { LibRichErrors.rrevert(LibExchangeRichErrors.TransactionError( - IExchangeRichErrors.TransactionErrorCodes.ALREADY_EXECUTED, + LibExchangeRichErrors.TransactionErrorCodes.ALREADY_EXECUTED, transactionHash )); } diff --git a/contracts/exchange/contracts/src/MixinWrapperFunctions.sol b/contracts/exchange/contracts/src/MixinWrapperFunctions.sol index 9643ccb5b1..16ff04f38e 100644 --- a/contracts/exchange/contracts/src/MixinWrapperFunctions.sol +++ b/contracts/exchange/contracts/src/MixinWrapperFunctions.sol @@ -24,10 +24,9 @@ import "@0x/contracts-utils/contracts/src/LibRichErrors.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "./interfaces/IExchangeCore.sol"; -import "./interfaces/IExchangeRichErrors.sol"; import "./interfaces/IWrapperFunctions.sol"; -import "./LibExchangeRichErrors.sol"; import "./MixinExchangeCore.sol"; diff --git a/contracts/exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol b/contracts/exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol index b56fcd7420..eb171b34ad 100644 --- a/contracts/exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol +++ b/contracts/exchange/contracts/src/libs/LibExchangeRichErrorDecoder.sol @@ -19,14 +19,12 @@ pragma solidity ^0.5.9; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibExchangeRichErrors.sol"; import "@0x/contracts-utils/contracts/src/LibBytes.sol"; -import "../interfaces/IExchangeRichErrors.sol"; -import "../LibExchangeRichErrors.sol"; -contract LibExchangeRichErrorDecoder is - IExchangeRichErrors -{ +contract LibExchangeRichErrorDecoder { + /// @dev Decompose an ABI-encoded SignatureError. /// @param encoded ABI-encoded revert error. /// @return errorCode The error code. @@ -36,14 +34,14 @@ contract LibExchangeRichErrorDecoder is public pure returns ( - SignatureErrorCodes errorCode, + LibExchangeRichErrors.SignatureErrorCodes errorCode, bytes32 hash, address signerAddress, bytes memory signature ) { _assertSelectorBytes(encoded, LibExchangeRichErrors.SignatureErrorSelector()); - errorCode = SignatureErrorCodes(_readErrorParameterAsUint256(encoded, 0)); + errorCode = LibExchangeRichErrors.SignatureErrorCodes(_readErrorParameterAsUint256(encoded, 0)); hash = _readErrorParameterAsBytes32(encoded, 1); signerAddress = _readErrorParameterAsAddress(encoded, 2); signature = _readErrorParameterAsBytes(encoded, 3); @@ -189,12 +187,12 @@ contract LibExchangeRichErrorDecoder is public pure returns ( - FillErrorCodes errorCode, + LibExchangeRichErrors.FillErrorCodes errorCode, bytes32 orderHash ) { _assertSelectorBytes(encoded, LibExchangeRichErrors.FillErrorSelector()); - errorCode = FillErrorCodes(_readErrorParameterAsUint256(encoded, 0)); + errorCode = LibExchangeRichErrors.FillErrorCodes(_readErrorParameterAsUint256(encoded, 0)); orderHash = _readErrorParameterAsBytes32(encoded, 1); } @@ -239,13 +237,13 @@ contract LibExchangeRichErrorDecoder is public pure returns ( - AssetProxyDispatchErrorCodes errorCode, + LibExchangeRichErrors.AssetProxyDispatchErrorCodes errorCode, bytes32 orderHash, bytes memory assetData ) { _assertSelectorBytes(encoded, LibExchangeRichErrors.AssetProxyDispatchErrorSelector()); - errorCode = AssetProxyDispatchErrorCodes(_readErrorParameterAsUint256(encoded, 0)); + errorCode = LibExchangeRichErrors.AssetProxyDispatchErrorCodes(_readErrorParameterAsUint256(encoded, 0)); orderHash = _readErrorParameterAsBytes32(encoded, 1); assetData = _readErrorParameterAsBytes(encoded, 2); } @@ -295,12 +293,12 @@ contract LibExchangeRichErrorDecoder is public pure returns ( - TransactionErrorCodes errorCode, + LibExchangeRichErrors.TransactionErrorCodes errorCode, bytes32 transactionHash ) { _assertSelectorBytes(encoded, LibExchangeRichErrors.TransactionErrorSelector()); - errorCode = TransactionErrorCodes(_readErrorParameterAsUint256(encoded, 0)); + errorCode = LibExchangeRichErrors.TransactionErrorCodes(_readErrorParameterAsUint256(encoded, 0)); transactionHash = _readErrorParameterAsBytes32(encoded, 1); } diff --git a/contracts/exchange/package.json b/contracts/exchange/package.json index 49b187bbb9..af8745683a 100644 --- a/contracts/exchange/package.json +++ b/contracts/exchange/package.json @@ -34,7 +34,7 @@ "lint-contracts": "solhint -c ../.solhint.json contracts/**/**/**/**/*.sol" }, "config": { - "abis": "./generated-artifacts/@(Exchange|ExchangeWrapper|IAssetProxyDispatcher|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|IWallet|IWrapperFunctions|IsolatedExchange|ReentrancyTester|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestSignatureValidator|TestValidatorWallet|TestWrapperFunctions|Whitelist).json", + "abis": "./generated-artifacts/@(Exchange|ExchangeWrapper|IAssetProxy|IAssetProxyDispatcher|IEIP1271Wallet|IExchange|IExchangeCore|IMatchOrders|ISignatureValidator|ITransactions|ITransferSimulator|IWallet|IWrapperFunctions|IsolatedExchange|LibExchangeRichErrorDecoder|MixinAssetProxyDispatcher|MixinExchangeCore|MixinMatchOrders|MixinSignatureValidator|MixinTransactions|MixinTransferSimulator|MixinWrapperFunctions|ReentrantERC20Token|TestAssetProxyDispatcher|TestExchangeInternals|TestLibExchangeRichErrorDecoder|TestSignatureValidator|TestValidatorWallet|Whitelist).json", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually." }, "repository": { diff --git a/contracts/exchange/src/artifacts.ts b/contracts/exchange/src/artifacts.ts index dccfcd9c8e..8c1aedae3e 100644 --- a/contracts/exchange/src/artifacts.ts +++ b/contracts/exchange/src/artifacts.ts @@ -12,7 +12,6 @@ import * as IAssetProxyDispatcher from '../generated-artifacts/IAssetProxyDispat import * as IEIP1271Wallet from '../generated-artifacts/IEIP1271Wallet.json'; import * as IExchange from '../generated-artifacts/IExchange.json'; import * as IExchangeCore from '../generated-artifacts/IExchangeCore.json'; -import * as IExchangeRichErrors from '../generated-artifacts/IExchangeRichErrors.json'; import * as IMatchOrders from '../generated-artifacts/IMatchOrders.json'; import * as ISignatureValidator from '../generated-artifacts/ISignatureValidator.json'; import * as ITransactions from '../generated-artifacts/ITransactions.json'; @@ -21,7 +20,6 @@ import * as IWallet from '../generated-artifacts/IWallet.json'; import * as IWrapperFunctions from '../generated-artifacts/IWrapperFunctions.json'; import * as IsolatedExchange from '../generated-artifacts/IsolatedExchange.json'; import * as LibExchangeRichErrorDecoder from '../generated-artifacts/LibExchangeRichErrorDecoder.json'; -import * as LibExchangeRichErrors from '../generated-artifacts/LibExchangeRichErrors.json'; import * as MixinAssetProxyDispatcher from '../generated-artifacts/MixinAssetProxyDispatcher.json'; import * as MixinExchangeCore from '../generated-artifacts/MixinExchangeCore.json'; import * as MixinMatchOrders from '../generated-artifacts/MixinMatchOrders.json'; @@ -41,7 +39,6 @@ export const artifacts = { ExchangeWrapper: ExchangeWrapper as ContractArtifact, Whitelist: Whitelist as ContractArtifact, Exchange: Exchange as ContractArtifact, - LibExchangeRichErrors: LibExchangeRichErrors as ContractArtifact, MixinAssetProxyDispatcher: MixinAssetProxyDispatcher as ContractArtifact, MixinExchangeCore: MixinExchangeCore as ContractArtifact, MixinMatchOrders: MixinMatchOrders as ContractArtifact, @@ -54,7 +51,6 @@ export const artifacts = { IEIP1271Wallet: IEIP1271Wallet as ContractArtifact, IExchange: IExchange as ContractArtifact, IExchangeCore: IExchangeCore as ContractArtifact, - IExchangeRichErrors: IExchangeRichErrors as ContractArtifact, IMatchOrders: IMatchOrders as ContractArtifact, ISignatureValidator: ISignatureValidator as ContractArtifact, ITransactions: ITransactions as ContractArtifact, diff --git a/contracts/exchange/src/wrappers.ts b/contracts/exchange/src/wrappers.ts index e3dcaabf84..171f93ba3e 100644 --- a/contracts/exchange/src/wrappers.ts +++ b/contracts/exchange/src/wrappers.ts @@ -10,7 +10,6 @@ export * from '../generated-wrappers/i_asset_proxy_dispatcher'; export * from '../generated-wrappers/i_e_i_p1271_wallet'; export * from '../generated-wrappers/i_exchange'; export * from '../generated-wrappers/i_exchange_core'; -export * from '../generated-wrappers/i_exchange_rich_errors'; export * from '../generated-wrappers/i_match_orders'; export * from '../generated-wrappers/i_signature_validator'; export * from '../generated-wrappers/i_transactions'; @@ -19,7 +18,6 @@ export * from '../generated-wrappers/i_wallet'; export * from '../generated-wrappers/i_wrapper_functions'; export * from '../generated-wrappers/isolated_exchange'; export * from '../generated-wrappers/lib_exchange_rich_error_decoder'; -export * from '../generated-wrappers/lib_exchange_rich_errors'; export * from '../generated-wrappers/mixin_asset_proxy_dispatcher'; export * from '../generated-wrappers/mixin_exchange_core'; export * from '../generated-wrappers/mixin_match_orders'; diff --git a/contracts/exchange/tsconfig.json b/contracts/exchange/tsconfig.json index 9902e10cef..f90e8ecc30 100644 --- a/contracts/exchange/tsconfig.json +++ b/contracts/exchange/tsconfig.json @@ -10,7 +10,6 @@ "generated-artifacts/IEIP1271Wallet.json", "generated-artifacts/IExchange.json", "generated-artifacts/IExchangeCore.json", - "generated-artifacts/IExchangeRichErrors.json", "generated-artifacts/IMatchOrders.json", "generated-artifacts/ISignatureValidator.json", "generated-artifacts/ITransactions.json", @@ -20,7 +19,6 @@ "generated-artifacts/IsolatedExchange.json", "generated-artifacts/ReentrancyTester.json", "generated-artifacts/LibExchangeRichErrorDecoder.json", - "generated-artifacts/LibExchangeRichErrors.json", "generated-artifacts/MixinAssetProxyDispatcher.json", "generated-artifacts/MixinExchangeCore.json", "generated-artifacts/MixinMatchOrders.json",